diff -r 0ddb100fea61 -r f924be23ffb4 QTfrontend/pages.h --- a/QTfrontend/pages.h Mon Dec 27 23:57:44 2010 +0100 +++ b/QTfrontend/pages.h Tue Jan 04 12:53:46 2011 +0100 @@ -61,6 +61,8 @@ class IconedGroupBox; class FreqSpinBox; +class DrawMapWidget; + class AbstractPage : public QWidget { Q_OBJECT @@ -69,8 +71,10 @@ protected: AbstractPage(QWidget* parent = 0) { + Q_UNUSED(parent); + font14 = new QFont("MS Shell Dlg", 14); - setFocusPolicy(Qt::StrongFocus); + //setFocusPolicy(Qt::StrongFocus); } virtual ~AbstractPage() {}; @@ -196,6 +200,9 @@ GameCFGWidget *gameCFG; TeamSelWidget *teamsSelect; QPushButton *BtnStartMPGame; + +signals: + void SetupClicked(); }; class PageOptions : public AbstractPage @@ -205,11 +212,16 @@ public: PageOptions(QWidget* parent = 0); - QPushButton *WeaponsButt; + QCheckBox *WeaponTooltip; + QPushButton *WeaponNew; QPushButton *WeaponEdit; QPushButton *WeaponDelete; QComboBox *WeaponsName; - QCheckBox *WeaponTooltip; + QPushButton *SchemeNew; + QPushButton *SchemeEdit; + QPushButton *SchemeDelete; + QComboBox *SchemesName; + QComboBox *CBLanguage; QPushButton *BtnBack; @@ -324,6 +336,9 @@ public slots: void setReadyStatus(bool isReady); void setMasterMode(bool isMaster); + +signals: + void SetupClicked(); }; class PageInfo : public AbstractPage @@ -389,8 +404,11 @@ QPushButton *BtnSave; QPushButton *BtnDefault; QPushButton *BtnDelete; + QPushButton *BtnNew; + QPushButton *BtnCopy; QPushButton *BtnBack; SelWeaponWidget* pWeapons; + QComboBox* selectWeaponSet; }; class PageInGame : public AbstractPage @@ -462,12 +480,19 @@ PageScheme(QWidget* parent = 0); QPushButton * BtnBack; + QPushButton * BtnCopy; QPushButton * BtnNew; QPushButton * BtnDelete; QPushButton * BtnSave; + QComboBox * selectScheme; void setModel(QAbstractItemModel * model); +public slots: + void newRow(); + void copyRow(); + void deleteRow(); + private: QDataWidgetMapper * mapper; ToggleButtonWidget * TBW_mode_Forts; @@ -507,16 +532,15 @@ QSpinBox * SB_Mines; QSpinBox * SB_MineDuds; QSpinBox * SB_Explosives; + QSpinBox * SB_RopeModifier; QLineEdit * LE_name; - QComboBox * selectScheme; QGroupBox * gbGameModes; QGroupBox * gbBasicSettings; private slots: - void newRow(); - void deleteRow(); void schemeSelected(int); + }; class PageAdmin : public AbstractPage @@ -565,4 +589,21 @@ QPushButton * BtnOfficialServer; }; + +class PageDrawMap : public AbstractPage +{ + Q_OBJECT + +public: + PageDrawMap(QWidget* parent = 0); + + QPushButton * BtnBack; + + DrawMapWidget * drawMapWidget; + +private slots: + void load(); + void save(); +}; + #endif // PAGES_H