diff -r 731ad6d27bd1 -r 4bac77f8cd38 QTfrontend/teamselhelper.cpp --- a/QTfrontend/teamselhelper.cpp Sat Jan 27 14:18:33 2007 +0000 +++ b/QTfrontend/teamselhelper.cpp Sat Jan 27 17:41:08 2007 +0000 @@ -111,17 +111,27 @@ return params; }*/ -void TeamShowWidget::changeTeamColor() +void TeamShowWidget::changeTeamColor(QColor color) { FrameTeams* pOurFrameTeams=dynamic_cast(parentWidget()); - if(++pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) { - pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin(); + if(!color.isValid()) { + if(++pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) { + pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin(); + } + color=QColor(*pOurFrameTeams->currentColor); } QPalette newPalette = palette(); - newPalette.setColor(QPalette::Button, QColor(*pOurFrameTeams->currentColor)); - newPalette.setColor(QPalette::Highlight, QColor(*pOurFrameTeams->currentColor)); + newPalette.setColor(QPalette::Button, color); + newPalette.setColor(QPalette::Highlight, color); //colorButt->setStyleSheet(QString("background-color : ")+pOurFrameTeams->currentColor->name()); colorButt->setStyle(QStyleFactory::create("plastique")); colorButt->setPalette(newPalette); + m_team.teamColor=color; + emit teamColorChanged(m_team); } + +HWTeam TeamShowWidget::getTeam() const +{ + return m_team; +}