diff -r 574b385ce7df -r fcab1fd02bc6 QTfrontend/ui/widget/teamselhelper.h --- a/QTfrontend/ui/widget/teamselhelper.h Sat May 26 16:50:51 2012 -0400 +++ b/QTfrontend/ui/widget/teamselhelper.h Sun May 27 23:42:43 2012 +0400 @@ -28,6 +28,8 @@ #include "teamselect.h" #include "hedgehogerWidget.h" +class ColorWidget; + class TeamLabel : public QLabel { Q_OBJECT @@ -48,13 +50,12 @@ Q_OBJECT public slots: - void incrementTeamColor(); - void decrementTeamColor(); - void changeTeamColor(QColor color=QColor()); + void changeTeamColor(int color = 0); void hhNumChanged(); private slots: void activateTeam(); + void onColorChanged(int color); public: TeamShowWidget(HWTeam team, bool isPlaying, FrameTeams * parent); @@ -69,10 +70,9 @@ HWTeam m_team; bool m_isPlaying; CHedgehogerWidget* phhoger; - QPushButton* colorButt; + ColorWidget* colorWidget; QPushButton* butt; FrameTeams * m_parentFrameTeams; -// QPushButton* bText; signals: void teamStatusChanged(HWTeam team);