equal
deleted
inserted
replaced
123 GoToPage(ID_PAGE_MAIN); |
123 GoToPage(ID_PAGE_MAIN); |
124 } |
124 } |
125 |
125 |
126 void HWForm::UpdateWeapons() |
126 void HWForm::UpdateWeapons() |
127 { |
127 { |
128 ui.pageOptions->WeaponsName->clear(); |
128 // FIXME: rewrite this with boost (or TR1/0x) |
129 ui.pageOptions->WeaponsName->addItems(ui.pageSelectWeapon->pWeapons->getWeaponNames()); |
129 QVector<QComboBox*> combos; |
130 |
130 combos.push_back(ui.pageOptions->WeaponsName); |
131 ui.pageMultiplayer->gameCFG->WeaponsName->clear(); |
131 combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName); |
132 ui.pageMultiplayer->gameCFG->WeaponsName->addItems(ui.pageSelectWeapon->pWeapons->getWeaponNames()); |
132 combos.push_back(ui.pageNetGame->pGameCFG->WeaponsName); |
133 |
133 |
134 ui.pageNetGame->pGameCFG->WeaponsName->clear(); |
134 for(QVector<QComboBox*>::iterator it=combos.begin(); it!=combos.end(); ++it) { |
135 ui.pageNetGame->pGameCFG->WeaponsName->addItems(ui.pageSelectWeapon->pWeapons->getWeaponNames()); |
135 (*it)->clear(); |
|
136 (*it)->addItems(ui.pageSelectWeapon->pWeapons->getWeaponNames()); |
|
137 int pos=(*it)->findText("Default"); |
|
138 if (pos!=-1) { |
|
139 (*it)->setCurrentIndex(pos); |
|
140 } |
|
141 } |
136 } |
142 } |
137 |
143 |
138 void HWForm::NetWeaponNameChanged(const QString& name) |
144 void HWForm::NetWeaponNameChanged(const QString& name) |
139 { |
145 { |
140 QString ammo=ui.pageSelectWeapon->pWeapons->getWeaponsString(ui.pageNetGame->pGameCFG->WeaponsName->currentText()); |
146 QString ammo=ui.pageSelectWeapon->pWeapons->getWeaponsString(ui.pageNetGame->pGameCFG->WeaponsName->currentText()); |