PPJoy settings dialog complete

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@13 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

1 files changed, 15 insertions, 16 deletions

diff --git a/FaceTrackNoIR/GeneratedFiles/ui_FTNoIR_ppjoycontrols.h b/FaceTrackNoIR/GeneratedFiles/ui_FTNoIR_ppjoycontrols.h
index d1759ec4..c712202d 100644
--- a/FaceTrackNoIR/GeneratedFiles/ui_FTNoIR_ppjoycontrols.h
+++ b/FaceTrackNoIR/GeneratedFiles/ui_FTNoIR_ppjoycontrols.h
@@ -1,7 +1,7 @@
 /********************************************************************************

 ** Form generated from reading UI file 'FTNoIR_ppjoycontrols.ui'

 **

-** Created: Sun 13. Jun 17:29:36 2010

+** Created: Mon 14. Jun 20:32:49 2010

 **      by: Qt User Interface Compiler version 4.6.2

 **

 ** WARNING! All changes made in this file will be lost when recompiling UI file!

@@ -14,6 +14,7 @@
 #include <QtGui/QAction>

 #include <QtGui/QApplication>

 #include <QtGui/QButtonGroup>

+#include <QtGui/QComboBox>

 #include <QtGui/QHBoxLayout>

 #include <QtGui/QHeaderView>

 #include <QtGui/QLabel>

@@ -30,7 +31,7 @@ public:
     QVBoxLayout *_vertical_layout;

     QHBoxLayout *hboxLayout;

     QLabel *textLabel2;

-    QLabel *_engine_state_label;

+    QComboBox *cbxSelectPPJoyNumber;

     QSpacerItem *verticalSpacer;

     QHBoxLayout *horizontalLayout;

     QSpacerItem *horizontalSpacer_2;

@@ -45,7 +46,7 @@ public:
             UICPPJoyControls->setObjectName(QString::fromUtf8("UICPPJoyControls"));

         UICPPJoyControls->resize(346, 180);

         QIcon icon;

-        icon.addFile(QString::fromUtf8(":/Icons/sm_api_qt_icon.png"), QSize(), QIcon::Normal, QIcon::Off);

+        icon.addFile(QString::fromUtf8("images/FaceTrackNoIR.ico"), QSize(), QIcon::Normal, QIcon::Off);

         UICPPJoyControls->setWindowIcon(icon);

         UICPPJoyControls->setLayoutDirection(Qt::LeftToRight);

         UICPPJoyControls->setAutoFillBackground(false);

@@ -65,18 +66,11 @@ public:
 

         hboxLayout->addWidget(textLabel2);

 

-        _engine_state_label = new QLabel(UICPPJoyControls);

-        _engine_state_label->setObjectName(QString::fromUtf8("_engine_state_label"));

-        QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed);

-        sizePolicy1.setHorizontalStretch(0);

-        sizePolicy1.setVerticalStretch(0);

-        sizePolicy1.setHeightForWidth(_engine_state_label->sizePolicy().hasHeightForWidth());

-        _engine_state_label->setSizePolicy(sizePolicy1);

-        _engine_state_label->setFrameShape(QFrame::Panel);

-        _engine_state_label->setFrameShadow(QFrame::Sunken);

-        _engine_state_label->setWordWrap(false);

+        cbxSelectPPJoyNumber = new QComboBox(UICPPJoyControls);

+        cbxSelectPPJoyNumber->setObjectName(QString::fromUtf8("cbxSelectPPJoyNumber"));

+        cbxSelectPPJoyNumber->setInsertPolicy(QComboBox::InsertAlphabetically);

 

-        hboxLayout->addWidget(_engine_state_label);

+        hboxLayout->addWidget(cbxSelectPPJoyNumber);

 

 

         _vertical_layout->addLayout(hboxLayout);

@@ -96,6 +90,9 @@ public:
         horizontalLayout_2->setSizeConstraint(QLayout::SetDefaultConstraint);

         btnOK = new QPushButton(UICPPJoyControls);

         btnOK->setObjectName(QString::fromUtf8("btnOK"));

+        QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed);

+        sizePolicy1.setHorizontalStretch(0);

+        sizePolicy1.setVerticalStretch(0);

         sizePolicy1.setHeightForWidth(btnOK->sizePolicy().hasHeightForWidth());

         btnOK->setSizePolicy(sizePolicy1);

         btnOK->setMinimumSize(QSize(100, 0));

@@ -130,9 +127,11 @@ public:
 

     void retranslateUi(QWidget *UICPPJoyControls)

     {

-        UICPPJoyControls->setWindowTitle(QApplication::translate("UICPPJoyControls", "Engine Controls", 0, QApplication::UnicodeUTF8));

+        UICPPJoyControls->setWindowTitle(QApplication::translate("UICPPJoyControls", "PPJoy settings FaceTrackNoIR", 0, QApplication::UnicodeUTF8));

         textLabel2->setText(QApplication::translate("UICPPJoyControls", "Virtual Joystick number:", 0, QApplication::UnicodeUTF8));

-        _engine_state_label->setText(QApplication::translate("UICPPJoyControls", "TERMINATED", 0, QApplication::UnicodeUTF8));

+#ifndef QT_NO_TOOLTIP

+        cbxSelectPPJoyNumber->setToolTip(QApplication::translate("UICPPJoyControls", "Select Number", 0, QApplication::UnicodeUTF8));

+#endif // QT_NO_TOOLTIP

         btnOK->setText(QApplication::translate("UICPPJoyControls", "OK", 0, QApplication::UnicodeUTF8));

         btnCancel->setText(QApplication::translate("UICPPJoyControls", "Cancel", 0, QApplication::UnicodeUTF8));

     } // retranslateUi