diff -r 731ad6d27bd1 -r 4bac77f8cd38 QTfrontend/teamselect.cpp --- a/QTfrontend/teamselect.cpp Sat Jan 27 14:18:33 2007 +0000 +++ b/QTfrontend/teamselect.cpp Sat Jan 27 17:41:08 2007 +0000 @@ -35,6 +35,8 @@ this, SLOT(netTeamStatusChanged(const HWTeam&))); connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), this, SLOT(hhNumChanged(const HWTeam&))); + connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), + this, SLOT(proxyTeamColorChanged(const HWTeam&))); } else { frameDontPlaying->addTeam(team, false); curDontPlayingTeams.push_back(team); @@ -55,14 +57,31 @@ emit hhogsNumChanged(team); } +void TeamSelWidget::proxyTeamColorChanged(const HWTeam& team) +{ + QList::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); + itPlay->teamColor=team.teamColor; + emit teamColorChanged(team); +} + void TeamSelWidget::changeHHNum(const HWTeam& team) { QList::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); + if(itPlay==curPlayingTeams.end()) return; itPlay->numHedgehogs=team.numHedgehogs; framePlaying->setHHNum(team); } +void TeamSelWidget::changeTeamColor(const HWTeam& team) +{ + QList::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); + if(itPlay==curPlayingTeams.end()) return; + itPlay->teamColor=team.teamColor; + + framePlaying->setTeamColor(team); +} + void TeamSelWidget::removeNetTeam(const HWTeam& team) { for(;;) { @@ -123,8 +142,13 @@ pRemoveTeams->removeTeam(team); QObject::connect(pAddTeams->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)), this, SLOT(changeTeamStatus(HWTeam))); - if(willBePlaying) connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), - this, SLOT(hhNumChanged(const HWTeam&))); + if(willBePlaying) { + connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), + this, SLOT(hhNumChanged(const HWTeam&))); + connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), + this, SLOT(proxyTeamColorChanged(const HWTeam&))); + emit teamColorChanged(((TeamShowWidget*)framePlaying->getTeamWidget(team))->getTeam()); + } QSize szh=pAddTeams->sizeHint(); QSize szh1=pRemoveTeams->sizeHint();