diff --git a/data/gui/default/window/addon_filter_options.cfg b/data/gui/default/window/addon_filter_options.cfg index 569f67cc699..1d47fa8f109 100644 --- a/data/gui/default/window/addon_filter_options.cfg +++ b/data/gui/default/window/addon_filter_options.cfg @@ -15,6 +15,18 @@ [/column] #enddef +#define _GUI_SPACER + [column] + grow_factor = 1 + border = "all" + border_size = 5 + horizontal_alignment = "left" + + [spacer] + [/spacer] + [/column] +#enddef + #define _GUI_ADDON_TYPE_OPTIONS [grid] @@ -39,6 +51,10 @@ {_GUI_ADDON_TYPE_OPTION mp_maps _"addons_of_type^MP map-packs"} {_GUI_ADDON_TYPE_OPTION unknown _"addons_of_type^Unknown"} [/row] + [row] + {_GUI_ADDON_TYPE_OPTION mp_mods _"addons_of_type^MP modifications"} + {_GUI_SPACER} + [/row] [/grid] #enddef @@ -257,3 +273,4 @@ #undef _GUI_ADDON_STATUS_OPTIONS #undef _GUI_ADDON_TYPE_OPTIONS #undef _GUI_ADDON_TYPE_OPTION +#undef _GUI_SPACER diff --git a/src/addon/info.cpp b/src/addon/info.cpp index 0be4c3b64aa..103fe1251e2 100644 --- a/src/addon/info.cpp +++ b/src/addon/info.cpp @@ -159,6 +159,8 @@ std::string addon_info::display_type() const return _("addon_type^MP scenario"); case ADDON_MP_CAMPAIGN: return _("addon_type^MP campaign"); + case ADDON_MP_MOD: + return _("addon_type^MP modification"); case ADDON_MEDIA: return _("addon_type^Resources"); case ADDON_OTHER: diff --git a/src/addon/validation.cpp b/src/addon/validation.cpp index 993ff852831..143e881f28d 100644 --- a/src/addon/validation.cpp +++ b/src/addon/validation.cpp @@ -25,7 +25,7 @@ const unsigned short default_campaignd_port = 15006; namespace { const std::string addon_type_strings[] = { "unknown", "campaign", "scenario", "campaign_mp", "scenario_mp", - "map_pack", "era", "faction", /* "mod", "gui", */ "media", "other", + "map_pack", "era", "faction", "mod_mp", /*"gui", */ "media", "other", "" }; } diff --git a/src/addon/validation.hpp b/src/addon/validation.hpp index 56fb778190d..78eaf84f3d6 100644 --- a/src/addon/validation.hpp +++ b/src/addon/validation.hpp @@ -49,7 +49,7 @@ enum ADDON_TYPE { ADDON_MP_ERA, /**< Multiplayer era. */ ADDON_MP_FACTION, /**< Multiplayer faction. */ // NOTE: following two still require proper engine support - //ADDON_MOD, // Modification of the game for SP and/or MP. + ADDON_MP_MOD, /**< Modification of the game for MP. */ //ADDON_GUI, // GUI add-ons/themes. ADDON_MEDIA, /**< Miscellaneous content/media (unit packs, terrain packs, music packs, etc.). */ ADDON_OTHER, /**< an add-on that fits in no other category */ diff --git a/src/gui/dialogs/addon/filter_options.cpp b/src/gui/dialogs/addon/filter_options.cpp index 4538bb3179c..5e96670e9b1 100644 --- a/src/gui/dialogs/addon/filter_options.cpp +++ b/src/gui/dialogs/addon/filter_options.cpp @@ -60,6 +60,7 @@ taddon_filter_options::taddon_filter_options() register_bool("show_mp_maps", true, displayed_types_[ADDON_MP_MAPS]); register_bool("show_mp_eras", true, displayed_types_[ADDON_MP_ERA]); register_bool("show_mp_factions", true, displayed_types_[ADDON_MP_FACTION]); + register_bool("show_mp_mods", true, displayed_types_[ADDON_MP_MOD]); register_bool("show_media", true, displayed_types_[ADDON_MEDIA]); // FIXME: (also in WML) should this and Unknown be a single option in the UI? register_bool("show_other", true, displayed_types_[ADDON_OTHER]);