Fixes for fullscreen mode, initial stab at multiple controller configs

[virtualjaguar] / src / gui / controllertab.cpp

diff --git a/src/gui/controllertab.cpp b/src/gui/controllertab.cpp
index 34ca1558541b30ab1e73709bc150d437eac00c4c..6050dd733a7125ed4bd34b969771b57d3cfcf59c 100644 (file)
--- a/src/gui/controllertab.cpp
+++ b/src/gui/controllertab.cpp
@@ -5,7 +5,7 @@
 // (C) 2011 Underground Software
 // See the README and GPLv3 files for licensing and warranty information
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
 // ---  ----------  ------------------------------------------------------------
@@ -16,27 +16,56 @@
 #include "controllertab.h"
 
 #include "controllerwidget.h"
+#include "gamepad.h"
 #include "joystick.h"
 #include "keygrabber.h"
 
 
-ControllerTab::ControllerTab(QWidget * parent/*= 0*/): QWidget(parent)
+ControllerTab::ControllerTab(QWidget * parent/*= 0*/): QWidget(parent),
+       label(new QLabel(tr("Controller:"))),
+       profile(new QComboBox(this)),
+       redefineAll(new QPushButton(tr("Define All Inputs"))),
+       controllerWidget(new ControllerWidget(this))
 {
-       controllerWidget = new ControllerWidget(this);
-       redefineAll = new QPushButton(tr("Define All Keys"));
-
        QVBoxLayout * layout = new QVBoxLayout;
+       QHBoxLayout * top = new QHBoxLayout;
+       layout->addLayout(top);
+       top->addWidget(label);
+       top->addWidget(profile, 0, Qt::AlignLeft);
        layout->addWidget(controllerWidget);
-       layout->addWidget(redefineAll);
+       layout->addWidget(redefineAll, 0, Qt::AlignHCenter);
+//     layout->setFixedWidth(label->width());
+//     layout->setSizeConstraint(QLayout::SetFixedSize);
+//     top->setSizeConstraint(QLayout::SetFixedSize);
+//printf("cw width = %i, label width = %i (min=%i, sizehint=%i)\n", controllerWidget->width(), label->width(), label->minimumWidth(), label->sizeHint().width());
+       // This is ugly, ugly, ugly. But it works. :-P It's a shame that Qt's
+       // layout system doesn't seem to allow for a nicer way to handle this.
+//     profile->setFixedWidth(controllerWidget->sizeHint().width() - label->sizeHint().width());
        setLayout(layout);
+       setFixedWidth(sizeHint().width());
 
        connect(redefineAll, SIGNAL(clicked()), this, SLOT(DefineAllKeys()));
+
+//this is the default. :-/ need to set it somewhere else i guess...
+//     profile->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow);
+       profile->addItem(tr("Keyboard"));
+
+       for(int i=0; i<Gamepad::numJoysticks; i++)
+               profile->addItem(Gamepad::GetJoystickName(i));
 }
 
+
 ControllerTab::~ControllerTab()
 {
 }
 
+
+//QSize ControllerTab::sizeHint(void) const
+//{
+//     return 
+//}
+
+
 void ControllerTab::DefineAllKeys(void)
 {
 //     char jagButtonName[21][10] = { "Up", "Down", "Left", "Right",
@@ -60,3 +89,4 @@ void ControllerTab::DefineAllKeys(void)
                controllerWidget->update();
        }
 }
+