Fixes in the controller config for MacOSX, added option to turn off GPU.

[virtualjaguar] / src / gui / keygrabber.cpp

diff --git a/src/gui/keygrabber.cpp b/src/gui/keygrabber.cpp
index 371c61991122a3d2a700a96b8ad8e90b37d89251..cc0b7143b08c861cfbf2bab5cac6c94e6bfa316c 100644 (file)
--- a/src/gui/keygrabber.cpp
+++ b/src/gui/keygrabber.cpp
@@ -21,15 +21,24 @@ KeyGrabber::KeyGrabber(QWidget * parent/*= 0*/): QDialog(parent)
        mainLayout->addWidget(label);
        setLayout(mainLayout);
        setWindowTitle(tr("Grab"));
+
+       // Will this make Mac OSX work???
+       setFocusPolicy(Qt::StrongFocus);
 }
 
 KeyGrabber::~KeyGrabber()
 {
 }
 
-void KeyGrabber::SetText(QString keyText)
+//void KeyGrabber::SetText(QString keyText)
+void KeyGrabber::SetKeyText(int keyNum)
 {
-       QString text = QString(tr("Press key for \"%1\"<br>(ESC to cancel)")).arg(keyText);
+       char jagButtonName[21][10] = { "Up", "Down", "Left", "Right",
+               "*", "7", "4", "1", "0", "8", "5", "2", "#", "9", "6", "3",
+               "A", "B", "C", "Option", "Pause" };
+
+       QString text = QString(tr("Press key for \"%1\"<br>(ESC to cancel)"))
+               .arg(QString(jagButtonName[keyNum]));
        label->setText(text);
 }