diff options
Diffstat (limited to 'pokemodr/MapTrainerUI.cpp')
| -rw-r--r-- | pokemodr/MapTrainerUI.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/pokemodr/MapTrainerUI.cpp b/pokemodr/MapTrainerUI.cpp index 8ad8a32c..acf31c6e 100644 --- a/pokemodr/MapTrainerUI.cpp +++ b/pokemodr/MapTrainerUI.cpp @@ -89,12 +89,7 @@ void MapTrainerUI::setGui() varSight->setValue(static_cast<MapTrainer*>(modified())->sight()); varDirection->setCurrentIndex(static_cast<MapTrainer*>(modified())->direction()); varNumberFight->setValue(static_cast<MapTrainer*>(modified())->numberFight()); - boxFlag->setChecked((static_cast<MapTrainer*>(modified())->flag().status() == Flag::Ignore) ? Qt::Unchecked : Qt::Checked); - if (boxFlag->isChecked()) - { - varFlag->setValue(static_cast<MapTrainer*>(modified())->flag().flag()); - varState->setCheckState((static_cast<MapTrainer*>(modified())->flag().status() == Flag::On) ? Qt::Checked : Qt::Unchecked); - } + varAppearFlag->setValue(static_cast<MapTrainer*>(modified())->appearFlag()); varDialog->setCurrentIndex(varDialog->findData(static_cast<MapTrainer*>(modified())->dialog())); varLeadTeamMember->setCurrentIndex(varLeadTeamMember->findData(static_cast<MapTrainer*>(modified())->leadTeamMember())); } @@ -142,20 +137,9 @@ void MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight) static_cast<MapTrainer*>(modified())->setNumberFight(numberFight); } -void MapTrainerUI::on_boxFlag_toggled(const bool flagUsed) -{ - if (!flagUsed) - static_cast<MapTrainer*>(modified())->setFlag(Flag(varFlag->value(), Flag::Ignore)); -} - -void MapTrainerUI::on_varFlag_valueChanged(const int flag) -{ - static_cast<MapTrainer*>(modified())->setFlag(Flag(flag, boxFlag->isChecked() ? Flag::Ignore : (varState->isChecked() ? Flag::On : Flag::Off))); -} - -void MapTrainerUI::on_varState_toggled(const bool status) +void MapTrainerUI::on_varAppearFlag_changed(const Flag& appearFlag) { - static_cast<MapTrainer*>(modified())->setFlag(Flag(varFlag->value(), status ? Flag::On : Flag::Off)); + static_cast<MapTrainer*>(modified())->setAppearFlag(appearFlag); } void MapTrainerUI::on_varDialog_currentIndexChanged(const int dialog) |