equal
deleted
inserted
replaced
116 FrameTeams* pOurFrameTeams=dynamic_cast<FrameTeams*>(parentWidget()); |
116 FrameTeams* pOurFrameTeams=dynamic_cast<FrameTeams*>(parentWidget()); |
117 if(!color.isValid()) { |
117 if(!color.isValid()) { |
118 if(++pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) { |
118 if(++pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) { |
119 pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin(); |
119 pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin(); |
120 } |
120 } |
121 color=QColor(*pOurFrameTeams->currentColor); |
121 color=*pOurFrameTeams->currentColor; |
|
122 } else { |
|
123 // set according color iterator |
|
124 pOurFrameTeams->currentColor=std::find(pOurFrameTeams->availableColors.begin(), |
|
125 pOurFrameTeams->availableColors.end(), color); |
|
126 if(pOurFrameTeams->currentColor==pOurFrameTeams->availableColors.end()) { |
|
127 // error condition |
|
128 throw; |
|
129 pOurFrameTeams->currentColor=pOurFrameTeams->availableColors.begin(); |
|
130 } |
122 } |
131 } |
123 |
132 |
124 QPalette newPalette = palette(); |
133 QPalette newPalette = palette(); |
125 newPalette.setColor(QPalette::Button, color); |
134 newPalette.setColor(QPalette::Button, color); |
126 newPalette.setColor(QPalette::Highlight, color); |
135 newPalette.setColor(QPalette::Highlight, color); |