From 25859cdc9986a5c603b26eaa0770bf0a2b252136 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 21 Jan 2009 02:33:40 -0500 Subject: Fixed more of Rules widget --- sigmodr/RulesUI.cpp | 14 +-- sigmodr/RulesUI.h | 4 +- sigmodr/gui/rules.ui | 347 +++++++++++++++++++++++++++++++++------------------ 3 files changed, 236 insertions(+), 129 deletions(-) diff --git a/sigmodr/RulesUI.cpp b/sigmodr/RulesUI.cpp index 601baa94..50c5c469 100644 --- a/sigmodr/RulesUI.cpp +++ b/sigmodr/RulesUI.cpp @@ -37,12 +37,12 @@ void Sigmodr::RulesUI::setGui() varGenders->setCheckState(qobject_cast(modified())->genderAllowed() ? Qt::Checked : Qt::Unchecked); varBreeding->setCheckState(qobject_cast(modified())->breedingAllowed() ? Qt::Checked : Qt::Unchecked); varBreeding->setEnabled(qobject_cast(modified())->genderAllowed()); - varCriticalDomains->setChecked(qobject_cast(modified())->criticalDomains() ? Qt::Checked : Qt::Unchecked); - varSwitchStyle->setChecked(qobject_cast(modified())->allowSwitchStyle() ? Qt::Checked : Qt::Unchecked); - varUseATB->setChecked(qobject_cast(modified())->useATB() ? Qt::Checked : Qt::Unchecked); - boxSplitSpecial->setChecked(qobject_cast(modified())->specialSplit() ? Qt::Checked : Qt::Unchecked); + varCriticalDomains->setCheckState(qobject_cast(modified())->criticalDomains() ? Qt::Checked : Qt::Unchecked); + varSwitchStyle->setCheckState(qobject_cast(modified())->allowSwitchStyle() ? Qt::Checked : Qt::Unchecked); + varUseATB->setCheckState(qobject_cast(modified())->useATB() ? Qt::Checked : Qt::Unchecked); + varSplitSpecial->setCheckState(qobject_cast(modified())->specialSplit() ? Qt::Checked : Qt::Unchecked); varSplitSpecialDV->setCheckState(qobject_cast(modified())->specialDVSplit() ? Qt::Checked : Qt::Unchecked); - boxEffortValues->setChecked(qobject_cast(modified())->effortValuesAllowed() ? Qt::Checked : Qt::Unchecked); + varEffortValues->setCheckState(qobject_cast(modified())->effortValuesAllowed() ? Qt::Checked : Qt::Unchecked); varMaxEV->setValue(qobject_cast(modified())->maxTotalEV()); varMaxEVPerStat->setEnabled(0 < qobject_cast(modified())->maxTotalEV()); varMaxEVPerStat->setMaximum(qobject_cast(modified())->maxTotalEV()); @@ -102,7 +102,7 @@ void Sigmodr::RulesUI::on_varUseATB_toggled(const bool useATB) qobject_cast(modified())->setUseATB(useATB); } -void Sigmodr::RulesUI::on_boxSplitSpecial_toggled(const bool splitSpecial) +void Sigmodr::RulesUI::on_varSplitSpecial_toggled(const bool splitSpecial) { qobject_cast(modified())->setSpecialSplit(splitSpecial); if (!splitSpecial) @@ -114,7 +114,7 @@ void Sigmodr::RulesUI::on_varSplitSpecialDV_toggled(const bool splitSpecialDV) qobject_cast(modified())->setSpecialDVSplit(splitSpecialDV); } -void Sigmodr::RulesUI::on_boxEffortValues_toggled(const bool effortValues) +void Sigmodr::RulesUI::on_varEffortValues_toggled(const bool effortValues) { qobject_cast(modified())->setEffortValuesAllowed(effortValues); } diff --git a/sigmodr/RulesUI.h b/sigmodr/RulesUI.h index 94206f9a..cec4c4eb 100644 --- a/sigmodr/RulesUI.h +++ b/sigmodr/RulesUI.h @@ -48,9 +48,9 @@ class RulesUI : public ObjectUI, private Ui::formRules void on_varCriticalDomains_toggled(const bool criticalDomains); void on_varSwitchStyle_toggled(const bool switchStyle); void on_varUseATB_toggled(const bool useATB); - void on_boxSplitSpecial_toggled(const bool specialSplit); + void on_varSplitSpecial_toggled(const bool specialSplit); void on_varSplitSpecialDV_toggled(const bool specialSplitDV); - void on_boxEffortValues_toggled(const bool effortValues); + void on_varEffortValues_toggled(const bool effortValues); void on_varMaxEV_valueChanged(const int maxEV); void on_varMaxEVPerStat_valueChanged(const int maxEVPerStat); void on_varBoxes_valueChanged(const int boxes); diff --git a/sigmodr/gui/rules.ui b/sigmodr/gui/rules.ui index 830b118d..0bdb7de0 100644 --- a/sigmodr/gui/rules.ui +++ b/sigmodr/gui/rules.ui @@ -48,6 +48,12 @@ + + + 0 + 0 + + If checked, breeding will be allowed @@ -151,14 +157,21 @@ - - - - Split Special + + + + Split special: - - true + + Qt::AlignRight|Qt::AlignVCenter + + varSplitSpecial + + + + + If checked, the special stat will be split into separate attack and defense stats @@ -168,141 +181,221 @@ If checked, the special stat will be split into separate attack and defense stats - - - - - If checked, the each special stat will have their own DV - - - If checked, the each special stat will have their own DV - - - If checked, the each special stat will have their own DV - - - Split Special DV - - - - + + Enabled + - - - - Effort Values + + + + + + Split special DV: + + + Qt::AlignRight|Qt::AlignVCenter + + + varSplitSpecialDV + + + + + + + + 0 + 0 + + + + If checked, the each special stat will have their own DV + + + If checked, the each special stat will have their own DV + + + If checked, the each special stat will have their own DV + + + Enabled + + + + + + + + + Effort values: - - true + + Qt::AlignRight|Qt::AlignVCenter + + + varEffortValues + + + + - If checked, stats will have effort values + If checked, stats will use effort values rather than stat experience - If checked, stats will have effort values + If checked, stats will use effort values rather than stat experience - If checked, stats will have effort values + If checked, stats will use effort values rather than stat experience + + + Enabled - - - - - Max EV - - - The maximum amount of effort values allowed - - - The maximum amount of effort values allowed - - - The maximum amount of effort values allowed - - - 0 - - - - - - - Max EV Per Stat - - - The maximum amount of effort values allowed for a single stat - - - The maximum amount of effort values allowed for a single stat - - - The maximum amount of effort values allowed for a single stat - - - 0 - - - - - - - - Storage + + + + + + Max total: + + + Qt::AlignRight|Qt::AlignVCenter + + + varMaxEV + + + + + + + + 0 + 0 + + + + The maximum amount of effort values allowed + + + The maximum amount of effort values allowed + + + The maximum amount of effort values allowed + + + 0 + + + + + + + Max per stat: + + + Qt::AlignRight|Qt::AlignVCenter + + + varMaxEVPerStat + + + + + + + + 0 + 0 + + + + The maximum amount of effort values allowed for a single stat + + + The maximum amount of effort values allowed for a single stat + + + The maximum amount of effort values allowed for a single stat + + + 0 + + + + + + + + + Boxes: + + Qt::AlignRight|Qt::AlignVCenter + + + varBoxes + + + + + - Computer storage values + How many boxes on the computer will be available - Computer storage values + How many boxes on the computer will be available - Computer storage values + How many boxes on the computer will be available + + + 0 - - - - - Boxes - - - How many boxes on the computer will be available - - - How many boxes on the computer will be available - - - How many boxes on the computer will be available - - - 0 - - - - - - - Box Size - - - How large each box is - - - How large each box is - - - How large each box is - - - 1 - - - - + + + + + + Box size: + + + Qt::AlignRight|Qt::AlignVCenter + + + varBoxSize + + + + + + + + 0 + 0 + + + + How large each box is + + + How large each box is + + + How large each box is + + + 1 + + + + + @@ -581,6 +674,20 @@
KIntNumInput
+ + varGenders + varBreeding + varCriticalDomains + varSwitchStyle + varUseATB + varSplitSpecial + varSplitSpecialDV + varEffortValues + varMaxEV + varMaxEVPerStat + varBoxes + varBoxSize + -- cgit