merges qt4 into trunk

git-svn-id: svn://svn.code.sf.net/p/qjoypad/code/trunk@94 c05e91a0-76c8-4ec0-b377-ef19ce7cc080
This commit is contained in:
John Toman
2009-08-03 00:46:33 +00:00
committed by virtuoussin13
parent 17ed926cdf
commit c1ef3fa0b7
12 changed files with 1596 additions and 1490 deletions

View File

@ -1,11 +1,7 @@
#ifndef LAYOUT_EDIT_H
#define LAYOUT_EDIT_H
//needed to build the dialog
#include <qdialog.h>
#include <qlayout.h>
#include <qcombobox.h>
#include <qwidgetstack.h>
#include <QStackedWidget>
//for the tab list of joypads
#include "flash.h"
@ -32,15 +28,12 @@ class LayoutEdit : public QDialog {
//find out when the window is activated.
virtual void windowActivationChange( bool oldActive );
//parts of the dialog:
QVBoxLayout *LMain;
QWidgetStack *PadStack;
QStackedWidget *PadStack;
FlashRadioArray *JoyButtons;
QComboBox* CLayouts;
QPushButton *BAdd, *BRem, *BUpd, *BRev;
};
#endif