Reordered SpeciesUI refreshGui

1 files changed, 20 insertions, 32 deletions

diff --git a/sigmodr/SpeciesUI.cpp b/sigmodr/SpeciesUI.cpp
index 851680e3..1c364ccf 100644
--- a/sigmodr/SpeciesUI.cpp
+++ b/sigmodr/SpeciesUI.cpp
@@ -124,6 +124,7 @@ void Sigmodr::SpeciesUI::refreshGui()
     varMaleBack->setIconSize(maxSize);
     varFemaleFront->setIconSize(maxSize);
     varFemaleBack->setIconSize(maxSize);
+    boxFemaleSprites->setEnabled(sigmod()->rules()->genderAllowed());
     const bool blockedSkin = varSkin->blockSignals(true);
     varSkin->clear();
     for (int i = 0; i < sigmod()->skinCount(); ++i)
@@ -132,42 +133,29 @@ void Sigmodr::SpeciesUI::refreshGui()
         varSkin->addItem(skin->name(), skin->id());
     }
     varSkin->blockSignals(blockedSkin);
-    if (sigmod()->rules()->genderAllowed())
+    const bool blockedEggSpecies = varEggSpecies->blockSignals(true);
+    varEggSpecies->clear();
+    for (int i = 0; i < sigmod()->speciesCount(); ++i)
     {
-        const bool blockedEggSpecies = varEggSpecies->blockSignals(true);
-        varEggSpecies->clear();
-        const bool blockedEggGroups = varEggGroups->blockSignals(true);
-        varEggGroups->availableListWidget()->clear();
-        varEggGroups->selectedListWidget()->clear();
-        if (sigmod()->rules()->breedingAllowed())
-        {
-            for (int i = 0; i < sigmod()->speciesCount(); ++i)
-            {
-                const Sigmod::Species* species = sigmod()->species(i);
-                varEggSpecies->addItem(species->name(), species->id());
-            }
-            for (int i = 0; i < sigmod()->eggGroupCount(); ++i)
-            {
-                const Sigmod::EggGroup* eggGroup = sigmod()->eggGroup(i);
-                QListWidgetItem* widgetItem = new QListWidgetItem(eggGroup->name(), varEggGroups->availableListWidget());
-                widgetItem->setData(Qt::UserRole, eggGroup->id());
-            }
-        }
-        else
-        {
-            boxEggSpecies->setEnabled(false);
-            varEggSteps->setEnabled(false);
-            boxEggGroups->setEnabled(false);
-        }
-        varEggSpecies->blockSignals(blockedEggSpecies);
-        varEggGroups->blockSignals(blockedEggGroups);
-        varEggGroups->setButtonsEnabled();
+        const Sigmod::Species* species = sigmod()->species(i);
+        varEggSpecies->addItem(species->name(), species->id());
     }
-    else
+    varEggSpecies->blockSignals(blockedEggSpecies);
+    boxEggSpecies->setEnabled(sigmod()->rules()->breedingAllowed());
+    varEggSteps->setEnabled(sigmod()->rules()->breedingAllowed());
+    const bool blockedEggGroups = varEggGroups->blockSignals(true);
+    varEggGroups->availableListWidget()->clear();
+    varEggGroups->selectedListWidget()->clear();
+    for (int i = 0; i < sigmod()->eggGroupCount(); ++i)
     {
-        tabGenetics->setEnabled(false);
-        boxFemaleSprites->setEnabled(false);
+        const Sigmod::EggGroup* eggGroup = sigmod()->eggGroup(i);
+        QListWidgetItem* widgetItem = new QListWidgetItem(eggGroup->name(), varEggGroups->availableListWidget());
+        widgetItem->setData(Qt::UserRole, eggGroup->id());
     }
+    varEggGroups->blockSignals(blockedEggGroups);
+    varEggGroups->setButtonsEnabled();
+    boxEggGroups->setEnabled(sigmod()->rules()->breedingAllowed());
+    tabGenetics->setEnabled(sigmod()->rules()->genderAllowed());
     const bool blockedTypes = varTypes->blockSignals(true);
     varTypes->availableListWidget()->clear();
     varTypes->selectedListWidget()->clear();