--- a/QTfrontend/hwform.h Sat Mar 06 10:54:24 2010 +0000
+++ b/QTfrontend/hwform.h Sat Mar 06 10:59:20 2010 +0000
@@ -48,118 +48,118 @@
class HWForm : public QMainWindow
{
- Q_OBJECT
+ Q_OBJECT
public:
- HWForm(QWidget *parent = 0);
- Ui_HWForm ui;
- SDLInteraction sdli;
- GameUIConfig * config;
+ HWForm(QWidget *parent = 0);
+ Ui_HWForm ui;
+ SDLInteraction sdli;
+ GameUIConfig * config;
QSettings * gameSettings; // Same file GameUIConfig points to but without the baggage. Needs sync() calls if you want to get GameUIConfig changes though
- void updateXfire();
+ void updateXfire();
private slots:
- void GoToMain();
- void GoToSinglePlayer();
- void GoToSetup();
- void GoToMultiplayer();
- void GoToSaves();
- void GoToDemos();
- void GoToNet();
- void GoToNetType();
- void GoToInfo();
- void GoToTraining();
- void GoToSelectWeapon();
- void GoToSelectWeaponSet(const QString & name);
- void GoToSelectNewWeapon();
- void GoToNetServer();
- void GoToSchemes();
- void GoToAdmin();
- void GoToPage(quint8 id);
- void GoBack();
- void btnExitPressed();
- void btnExitClicked();
- void IntermediateSetup();
- void NewTeam();
- void EditTeam();
- void RandomNames();
- void RandomName(const int &i);
- void TeamSave();
- void TeamDiscard();
- void SimpleGame();
- void PlayDemo();
- void StartTraining();
- void NetConnect();
- void NetConnectServer(const QString & host, quint16 port);
- void NetConnectOfficialServer();
- void NetStartServer();
- void NetDisconnect();
- void NetConnected();
- void NetGameEnter();
- void AddNetTeam(const HWTeam& team);
- void StartMPGame();
- void GameStateChanged(GameState gameState);
- void ForcedDisconnect();
- void ShowErrorMessage(const QString &);
- void GetRecord(bool isDemo, const QByteArray & record);
- void CreateNetGame();
- void UpdateWeapons();
- void onFrontendFullscreen(bool value);
- void Music(bool checked);
+ void GoToMain();
+ void GoToSinglePlayer();
+ void GoToSetup();
+ void GoToMultiplayer();
+ void GoToSaves();
+ void GoToDemos();
+ void GoToNet();
+ void GoToNetType();
+ void GoToInfo();
+ void GoToTraining();
+ void GoToSelectWeapon();
+ void GoToSelectWeaponSet(const QString & name);
+ void GoToSelectNewWeapon();
+ void GoToNetServer();
+ void GoToSchemes();
+ void GoToAdmin();
+ void GoToPage(quint8 id);
+ void GoBack();
+ void btnExitPressed();
+ void btnExitClicked();
+ void IntermediateSetup();
+ void NewTeam();
+ void EditTeam();
+ void RandomNames();
+ void RandomName(const int &i);
+ void TeamSave();
+ void TeamDiscard();
+ void SimpleGame();
+ void PlayDemo();
+ void StartTraining();
+ void NetConnect();
+ void NetConnectServer(const QString & host, quint16 port);
+ void NetConnectOfficialServer();
+ void NetStartServer();
+ void NetDisconnect();
+ void NetConnected();
+ void NetGameEnter();
+ void AddNetTeam(const HWTeam& team);
+ void StartMPGame();
+ void GameStateChanged(GameState gameState);
+ void ForcedDisconnect();
+ void ShowErrorMessage(const QString &);
+ void GetRecord(bool isDemo, const QByteArray & record);
+ void CreateNetGame();
+ void UpdateWeapons();
+ void onFrontendFullscreen(bool value);
+ void Music(bool checked);
- void NetGameChangeStatus(bool isMaster);
- void NetGameMaster();
- void NetGameSlave();
+ void NetGameChangeStatus(bool isMaster);
+ void NetGameMaster();
+ void NetGameSlave();
- void AsyncNetServerStart();
- void NetLeftRoom();
- void selectFirstNetScheme();
+ void AsyncNetServerStart();
+ void NetLeftRoom();
+ void selectFirstNetScheme();
private:
- void _NetConnect(const QString & hostName, quint16 port, const QString & nick);
- void UpdateTeamsLists(const QStringList* editable_teams=0);
- void CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo);
- void closeEvent(QCloseEvent *event);
- void CustomizePalettes();
- void resizeEvent(QResizeEvent * event);
+ void _NetConnect(const QString & hostName, quint16 port, const QString & nick);
+ void UpdateTeamsLists(const QStringList* editable_teams=0);
+ void CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo);
+ void closeEvent(QCloseEvent *event);
+ void CustomizePalettes();
+ void resizeEvent(QResizeEvent * event);
- enum PageIDs {
- ID_PAGE_SETUP_TEAM = 0,
- ID_PAGE_SETUP = 1,
- ID_PAGE_MULTIPLAYER = 2,
- ID_PAGE_DEMOS = 3,
- ID_PAGE_NET = 4,
- ID_PAGE_NETGAME = 5,
- ID_PAGE_INFO = 6,
- ID_PAGE_MAIN = 7,
- ID_PAGE_GAMESTATS = 8,
- ID_PAGE_SINGLEPLAYER = 9,
- ID_PAGE_TRAINING = 10,
- ID_PAGE_SELECTWEAPON = 11,
- ID_PAGE_NETSERVER = 12,
- ID_PAGE_INGAME = 13,
- ID_PAGE_ROOMSLIST = 14,
- ID_PAGE_CONNECTING = 15,
- ID_PAGE_SCHEME = 16,
- ID_PAGE_ADMIN = 17,
- ID_PAGE_NETTYPE = 18
- };
- HWGame * game;
- HWNetServer* pnetserver;
- HWNetRegisterServer* pRegisterServer;
- HWTeam * editedTeam;
- HWNewNet * hwnet;
- HWNamegen * namegen;
- AmmoSchemeModel * ammoSchemeModel;
- QStack<quint8> PagesStack;
- QTime eggTimer;
- BGWidget * wBackground;
+ enum PageIDs {
+ ID_PAGE_SETUP_TEAM = 0,
+ ID_PAGE_SETUP = 1,
+ ID_PAGE_MULTIPLAYER = 2,
+ ID_PAGE_DEMOS = 3,
+ ID_PAGE_NET = 4,
+ ID_PAGE_NETGAME = 5,
+ ID_PAGE_INFO = 6,
+ ID_PAGE_MAIN = 7,
+ ID_PAGE_GAMESTATS = 8,
+ ID_PAGE_SINGLEPLAYER = 9,
+ ID_PAGE_TRAINING = 10,
+ ID_PAGE_SELECTWEAPON = 11,
+ ID_PAGE_NETSERVER = 12,
+ ID_PAGE_INGAME = 13,
+ ID_PAGE_ROOMSLIST = 14,
+ ID_PAGE_CONNECTING = 15,
+ ID_PAGE_SCHEME = 16,
+ ID_PAGE_ADMIN = 17,
+ ID_PAGE_NETTYPE = 18
+ };
+ HWGame * game;
+ HWNetServer* pnetserver;
+ HWNetRegisterServer* pRegisterServer;
+ HWTeam * editedTeam;
+ HWNewNet * hwnet;
+ HWNamegen * namegen;
+ AmmoSchemeModel * ammoSchemeModel;
+ QStack<quint8> PagesStack;
+ QTime eggTimer;
+ BGWidget * wBackground;
#ifdef __APPLE__
InstallController * panel;
#endif
- void OnPageShown(quint8 id, quint8 lastid=0);
+ void OnPageShown(quint8 id, quint8 lastid=0);
};
#endif