Changeset 3423 in orxonox.OLD for orxonox/trunk/src/gui/orxonox_gui_keys.cc

Timestamp:

Feb 27, 2005, 7:11:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/updater back into the trunk
merged with command: svn merge branches/updater trunk -r 3241:HEAD
resolved conflicts in debug.h in favor of the trunk.

File:

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

orxonox/trunk/src/gui/orxonox_gui_keys.cc

@@ -29 +29 @@
    \brief Creates an Keyboard-Frame
 */
-OrxonoxGuiKeys::OrxonoxGuiKeys ()
-{
-  keysFrame = new Frame ("Keyboard-Options:");
+OrxonoxGuiKeys::OrxonoxGuiKeys(void)
+{
+  this->keysFrame = new Frame("Keyboard-Options:");
   //  keysFrame->setGroupName("Keyboard");
-  keysBox = new Box ('h');
-  player1 = new Player("player1");
-  player2 = new Player("player2");
-
-  keysBox->fill(player1->getOpenButton());
-  keysBox->fill(player2->getOpenButton());
-
-  keysFrame->fill (keysBox);
+  this->keysBox = new Box('h');
+  this->player1 = new Player("player1");
+  this->player2 = new Player("player2");
+
+  this->keysBox->fill(this->player1->getOpenButton());
+  this->keysBox->fill(this->player2->getOpenButton());
+
+  this->keysFrame->fill(this->keysBox);
+}
+
+/**
+   \brief Destructs the Keys-stuff
+*/
+OrxonoxGuiKeys::~OrxonoxGuiKeys(void)
+{
+  // nothing to do here.
 }
 
@@ -47 +55 @@
    \return Returns the Audio-frame
 */
-Widget* OrxonoxGuiKeys::getWidget ()
-{
-  return keysFrame;
+Widget* OrxonoxGuiKeys::getWidget(void)
+{
+  return this->keysFrame;
 }
 
@@ -60 +68 @@
 Player::Player(char* player)
 {
-  char windowName[100] = "Keyboard settings of ";
-  strcat (windowName, player);
-  pKeyWindow = new Window(windowName);
-  pKeyFrame = new Frame (windowName);
-   pKeysBox = new Box('v');
-   pKeysBox->setGroupName (player);
-    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"));
-    
+  char* windowName = new char[strlen(player)+25];
+  strcpy(windowName, "Keyboard settings of ");
+  strcat(windowName, player);
+  this->pKeyWindow = new Window(windowName);
+  this->pKeyFrame = new Frame(windowName);
+   this->pKeysBox = new Box('v');
+   this->pKeysBox->setGroupName(player);
+    this->pKeysBox->fill(addKey(UP, "up"));
+    this->pKeysBox->fill(addKey(DOWN, "down"));
+    this->pKeysBox->fill(addKey(LEFT, "left"));
+    this->pKeysBox->fill(addKey(RIGHT, "right"));
+    this->pKeysBox->fill(addKey(SHOOT, "shoot"));
+    delete windowName;
     closeButton = new Button("close");
 #ifdef HAVE_GTK2
-    closeButton->connectSignal("button_press_event", pKeyWindow, Window::windowClose);
-#endif /* HAVE_GTK2 */
-
-    pKeysBox->fill(closeButton);
-    pKeyFrame->fill(pKeysBox);
-   pKeyWindow->fill(pKeyFrame);
-   Window::addWindow(pKeyWindow);
-#ifdef HAVE_GTK2
-   pKeyWindow->connectSignal("destroy", pKeyWindow, Window::windowClose);
-   pKeyWindow->connectSignal("delete_event", pKeyWindow, Window::windowClose);
-#endif /* HAVE_GTK2 */
-
-  openButton = new Button (player);
-#ifdef HAVE_GTK2
-  openButton->connectSignal("button_press_event", pKeyWindow, Window::windowOpen);
-#endif /* HAVE_GTK2 */
-
-  inputWindow = new Window("inputWindow");
-
-  inputButton = new Button ("test");
-  inputWindow->fill (inputButton);
-#ifdef HAVE_GTK2
-  inputWindow->connectSignal("destroy",  Widget::doNothingSignal);
-  inputWindow->connectSignal("delete_event", Widget::doNothingSignal);
+    this->closeButton->connectSignal("button_press_event", this->pKeyWindow, Window::windowClose);
+#endif /* HAVE_GTK2 */
+
+    this->pKeysBox->fill(this->closeButton);
+    this->pKeyFrame->fill(this->pKeysBox);
+   this->pKeyWindow->fill(this->pKeyFrame);
+   Window::addWindow(this->pKeyWindow);
+#ifdef HAVE_GTK2
+   this->pKeyWindow->connectSignal("destroy", this->pKeyWindow, Window::windowClose);
+   this->pKeyWindow->connectSignal("delete_event", this->pKeyWindow, Window::windowClose);
+#endif /* HAVE_GTK2 */
+
+  this->openButton = new Button(player);
+#ifdef HAVE_GTK2
+  this->openButton->connectSignal("button_press_event", this->pKeyWindow, Window::windowOpen);
+#endif /* HAVE_GTK2 */
+
+  this->inputWindow = new Window("inputWindow");
+
+  this->inputButton = new Button("test");
+  this->inputWindow->fill(inputButton);
+#ifdef HAVE_GTK2
+  this->inputWindow->connectSignal("destroy",  Widget::doNothingSignal);
+  this->inputWindow->connectSignal("delete_event", Widget::doNothingSignal);
 #endif /* HAVE_GTK2 */
 
@@ -108 +117 @@
    \returns A widget that has the Key-Box
 */
-Widget* Player::addKey (KEYS key, char* name)
-{
-  inputKey[key] = new InputKey;
-  inputKey[key]->pKeyBox = new Box();
-  inputKey[key]->pKeyButton = new Button(name);
-  inputKey[key]->pKeyOLabel = new OptionLabel (name, name);
-  inputKey[key]->pKeyOLabel->saveable = true;
+Widget* Player::addKey(KEYS key, char* name)
+{
+  this->inputKey[key] = new InputKey;
+  this->inputKey[key]->pKeyBox = new Box();
+  this->inputKey[key]->pKeyButton = new Button(name);
+  this->inputKey[key]->pKeyOLabel = new OptionLabel(name, name);
+  this->inputKey[key]->pKeyOLabel->saveability();
 
 #ifdef HAVE_GTK2
   //inputKey[key]->pKeyButton->connectSignal("key_press_event", inputKey[key]->pKeyButton, key_cb);
-  inputKey[key]->pKeyButton->connectSignal("button_press_event", inputKey[key], inputWindowEvent);
-#endif /* HAVE_GTK2 */
-  inputKey[key]->pKeyBox->fill(inputKey[key]->pKeyButton);
-  inputKey[key]->pKeyBox->fill(inputKey[key]->pKeyOLabel);
-  return inputKey[key]->pKeyBox;
+  this->inputKey[key]->pKeyButton->connectSignal("button_press_event", this->inputKey[key], inputWindowEvent);
+#endif /* HAVE_GTK2 */
+  this->inputKey[key]->pKeyBox->fill(this->inputKey[key]->pKeyButton);
+  this->inputKey[key]->pKeyBox->fill(this->inputKey[key]->pKeyOLabel);
+  return this->inputKey[key]->pKeyBox;
 }
 
@@ -128 +137 @@
    \returns the OpenButton of a Player
 */
-Button* Player::getOpenButton()
-{
-  return openButton;
-}
-
-/**
-   \brief sets a new Key (only output)
+Button* Player::getOpenButton(void)
+{
+  return this->openButton;
+}
+
+/**
+   \brief sets a new Key(only output)
    \param key the new Key.
 */
@@ -163 +172 @@
 gint Player::key_cb(GtkWidget* w, GdkEventKey* event, void* inputKey)
 {
-  InputKey* inputkey = (InputKey*) inputKey;
+  InputKey* inputkey =(InputKey*) inputKey;
   char title [20];
 
@@ -256 +265 @@
       char* tmp;
       sprintf(tmp, "%c", event->keyval);
-      printf ("other key %s \n", tmp);
+      printf("other key %s \n", tmp);
       strcpy(title, tmp);
       break;
     }
 
-  inputkey->pKeyOLabel->setValue (title);
+  inputkey->pKeyOLabel->setValue(title);
   inputButton->disconnectSignal(keySignal);
   inputWindow->close();