Add shiny lock option to Event Manaphy research #414
Conversation
Real96
changed the title
|
Seeing as this is a static entry, I believe we should be following the same format as before and have it all contained within the templates rather than a check box just for a single Pokemon. If this means there are two static templates for locked vs non-locked then that should still be better. |
Added the second template! |
Source/Form/Gen4/Static4.ui
Outdated
There was a problem hiding this comment.
I don't believe this file needs to have any changes
There was a problem hiding this comment.
Yes if we add the shiny combobox, right?
There was a problem hiding this comment.
Added combobox instead of checkbox
Source/Form/Gen4/Static4.cpp
Outdated
|
|
||
| if (staticTemplate->getShiny() == Shiny::Never) | ||
| { | ||
| ui->checkBoxSearcherShinyLock->setChecked(true); | ||
| } | ||
| else | ||
| { | ||
| ui->checkBoxSearcherShinyLock->setChecked(false); | ||
| } |
There was a problem hiding this comment.
This should be able to be removed
Source/Form/Gen4/Static4.cpp
Outdated
|
|
||
| if (staticTemplate->getShiny() == Shiny::Never) { | ||
| ui->checkBoxGeneratorShinyLock->setChecked(true); | ||
| } | ||
| else { | ||
| ui->checkBoxGeneratorShinyLock->setChecked(false); | ||
| } |
There was a problem hiding this comment.
This should be able to be removed
Source/Form/Gen4/Static4.cpp
Outdated
| ui->comboBoxGeneratorPokemon->addItem( | ||
| QString::fromStdString(Translator::getSpecie(templates[i].getSpecie(), templates[i].getForm())), | ||
| QVariant::fromValue(i)); | ||
|
|
||
| if (templates[i].getShiny() == Shiny::Never) | ||
| { | ||
| ui->comboBoxGeneratorPokemon->addItem( | ||
| QString::fromStdString(Translator::getSpecie(templates[i].getSpecie(), templates[i].getForm())) | ||
| + " (" + tr("Shiny Locked") + ")", | ||
| QVariant::fromValue(i)); | ||
| } | ||
| else | ||
| { | ||
| ui->comboBoxGeneratorPokemon->addItem( | ||
| QString::fromStdString(Translator::getSpecie(templates[i].getSpecie(), templates[i].getForm())), | ||
| QVariant::fromValue(i)); | ||
| } |
There was a problem hiding this comment.
Do we want to do this or just add a shiny combobox that gets filled out by the template like we have in the other windows?
There was a problem hiding this comment.
Can't we have both? Or you prefer having only one of the two?
Imo, i would keep both. But if you want only one of the two, the shiny combobox would be better because "Shiny Locked" text is being cut.
You mean this as combobox, right?
Source/Form/i18n/PokeFinder_de.ts
Outdated
There was a problem hiding this comment.
I don't believe this file needs to have any changes
Source/Form/i18n/PokeFinder_fr.ts
Outdated
There was a problem hiding this comment.
I don't believe this file needs to have any changes
Source/Form/i18n/PokeFinder_it.ts
Outdated
There was a problem hiding this comment.
I don't believe this file needs to have any changes
Source/Form/i18n/PokeFinder_ja.ts
Outdated
There was a problem hiding this comment.
I don't believe this file needs to have any changes
Source/Form/i18n/PokeFinder_ko.ts
Outdated
There was a problem hiding this comment.
I don't believe this file needs to have any changes
Source/Form/i18n/PokeFinder_zh.ts
Outdated
There was a problem hiding this comment.
I don't believe this file needs to have any changes
Add what asked in #413