diff -r fc2fb5c938c3 -r 91f461c218ab QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Sun Apr 19 13:36:51 2009 +0000 +++ b/QTfrontend/hwform.cpp Sun Apr 19 15:44:47 2009 +0000 @@ -92,6 +92,7 @@ ui.pageMultiplayer->BtnStartMPGame, SLOT(setEnabled(bool))); connect(ui.pageMultiplayer->teamsSelect, SIGNAL(SetupClicked()), this, SLOT(IntermediateSetup())); connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToSchemes()), this, SLOT(GoToSchemes())); + connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToWeapons(const QString &)), this, SLOT(GoToSelectWeaponSet(const QString &))); connect(ui.pagePlayDemo->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack())); connect(ui.pagePlayDemo->BtnPlayDemo, SIGNAL(clicked()), this, SLOT(PlayDemo())); @@ -122,6 +123,7 @@ ui.pageNetGame->BtnStart, SLOT(setEnabled(bool))); connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(SetupClicked()), this, SLOT(IntermediateSetup())); connect(ui.pageNetGame->pGameCFG, SIGNAL(goToSchemes()), this, SLOT(GoToSchemes())); + connect(ui.pageNetGame->pGameCFG, SIGNAL(goToWeapons(const QString &)), this, SLOT(GoToSelectWeaponSet(const QString &))); connect(ui.pageRoomsList->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack())); connect(ui.pageRoomsList->BtnAdmin, SIGNAL(clicked()), this, SLOT(GoToAdmin())); @@ -263,6 +265,12 @@ GoToPage(ID_PAGE_SELECTWEAPON); } +void HWForm::GoToSelectWeaponSet(const QString & name) +{ + ui.pageSelectWeapon->pWeapons->setWeaponsName(name); + GoToPage(ID_PAGE_SELECTWEAPON); +} + void HWForm::GoToInfo() { GoToPage(ID_PAGE_INFO);