diff options
Diffstat (limited to 'src/gui/models')
| -rw-r--r-- | src/gui/models/colorlistmodel.h | 2 | ||||
| -rw-r--r-- | src/gui/models/magicschoolmodel.h | 2 | ||||
| -rw-r--r-- | src/gui/models/sortlistmodelbuy.h | 6 | ||||
| -rw-r--r-- | src/gui/models/sortlistmodelinv.h | 6 | ||||
| -rw-r--r-- | src/gui/models/targettypemodel.h | 2 | ||||
| -rw-r--r-- | src/gui/models/typelistmodel.h | 32 | ||||
| -rw-r--r-- | src/gui/models/updatetypemodel.h | 2 |
7 files changed, 24 insertions, 28 deletions
diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h index 53844b8a2..9bec07b5c 100644 --- a/src/gui/models/colorlistmodel.h +++ b/src/gui/models/colorlistmodel.h @@ -71,7 +71,7 @@ class ColorListModel final : public ListModel int getNumberOfElements() override final { - return 14; + return NUM_ELEMENTS(COLOR_NAME); } std::string getElementAt(int i) override final diff --git a/src/gui/models/magicschoolmodel.h b/src/gui/models/magicschoolmodel.h index 05b71b2c8..96a433cf6 100644 --- a/src/gui/models/magicschoolmodel.h +++ b/src/gui/models/magicschoolmodel.h @@ -30,8 +30,6 @@ #include "localconsts.h" -#define NUM_ELEMENTS(a) sizeof(a) / sizeof(a[0]) - const char *MAGIC_SCHOOL_TEXT[] = { // TRANSLATORS: magic school diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h index 573452a1d..8d5b316ae 100644 --- a/src/gui/models/sortlistmodelbuy.h +++ b/src/gui/models/sortlistmodelbuy.h @@ -28,9 +28,7 @@ #include "utils/gettext.h" -#define NUM_ELEMENTS(a) sizeof(a) / sizeof(a[0]) - -static const char *const SORT_NAME_BUY[8] = +static const char *const SORT_NAME_BUY[] = { // TRANSLATORS: buy dialog sort type. N_("unsorted"), @@ -47,7 +45,7 @@ static const char *const SORT_NAME_BUY[8] = // TRANSLATORS: buy dialog sort type. N_("by amount"), // TRANSLATORS: buy dialog sort type. - N_("by type") + N_("by type & slot"), }; class SortListModelBuy final : public ListModel diff --git a/src/gui/models/sortlistmodelinv.h b/src/gui/models/sortlistmodelinv.h index eaf5c323b..fdd6cdb50 100644 --- a/src/gui/models/sortlistmodelinv.h +++ b/src/gui/models/sortlistmodelinv.h @@ -27,9 +27,7 @@ #include "utils/gettext.h" -#define NUM_ELEMENTS(a) sizeof(a) / sizeof(a[0]) - -static const char *const SORT_NAME_INVENTORY[7] = +static const char *const SORT_NAME_INVENTORY[] = { // TRANSLATORS: inventory sort mode N_("default"), @@ -44,7 +42,7 @@ static const char *const SORT_NAME_INVENTORY[7] = // TRANSLATORS: inventory sort mode N_("by amount"), // TRANSLATORS: inventory sort mode - N_("by type") + N_("by type & slot"), }; class SortListModelInv final : public ListModel diff --git a/src/gui/models/targettypemodel.h b/src/gui/models/targettypemodel.h index 4453b6e45..837801600 100644 --- a/src/gui/models/targettypemodel.h +++ b/src/gui/models/targettypemodel.h @@ -48,7 +48,7 @@ class TargetTypeModel final : public ListModel int getNumberOfElements() override final { - return 3; + return NUM_ELEMENTS(TARGET_TYPE_TEXT); } std::string getElementAt(int i) override final diff --git a/src/gui/models/typelistmodel.h b/src/gui/models/typelistmodel.h index d32db564b..78ad39bfa 100644 --- a/src/gui/models/typelistmodel.h +++ b/src/gui/models/typelistmodel.h @@ -33,6 +33,16 @@ #define SERVER_TYPE_INDEX_OFFSET 1 #endif // TMWA_SUPPORT +// No translations here. +const char *SERVER_TYPE_TEXT[] = +{ +#ifdef TMWA_SUPPORT + "TMW Athena", +#endif // defined(TMWA_SUPPORT) + "Hercules", + "Evol2 Hercules", +}; + /** * Server Type List Model */ @@ -49,27 +59,19 @@ class TypeListModel final : public ListModel * Used to get number of line in the list */ int getNumberOfElements() override final A_WARN_UNUSED -#if defined(TMWA_SUPPORT) - { return 3; } -#else // defined(TMWA_SUPPORT) - { return 2; } -#endif // defined(TMWA_SUPPORT) + { + return NUM_ELEMENTS(SERVER_TYPE_TEXT); + } /** * Used to get an element from the list */ - std::string getElementAt(int elementIndex) + std::string getElementAt(int index) override final A_WARN_UNUSED { - switch (elementIndex) - { -#ifdef TMWA_SUPPORT - case 0: return "TMW Athena"; break; -#endif // defined(TMWA_SUPPORT) - case 1 - SERVER_TYPE_INDEX_OFFSET: return "Hercules"; break; - case 2 - SERVER_TYPE_INDEX_OFFSET: return "Evol2 Hercules"; break; - default: return "Unknown"; break; - } + if (0 <= index && index < getNumberOfElements()) + return SERVER_TYPE_TEXT[index]; + return "Unknown"; } }; diff --git a/src/gui/models/updatetypemodel.h b/src/gui/models/updatetypemodel.h index b30160133..5f111a2bd 100644 --- a/src/gui/models/updatetypemodel.h +++ b/src/gui/models/updatetypemodel.h @@ -47,7 +47,7 @@ class UpdateTypeModel final : public ListModel int getNumberOfElements() override final { - return 3; + return NUM_ELEMENTS(UPDATE_TYPE_TEXT); } std::string getElementAt(int i) override final |