epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add an option to order maps by title

Browse Source
This commit is contained in:
Gustas
2023-07-10 15:52:26 +03:00
committed by abcdefg30
parent 8aa548f70c
commit de5bcbbca5
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs
View File

@@ -66,6 +66,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
[TranslationReference] [TranslationReference]
const string OrderMapsByPlayers = "options-order-maps.player-count"; const string OrderMapsByPlayers = "options-order-maps.player-count";
[TranslationReference]
const string OrderMapsByTitle = "options-order-maps.title";
[TranslationReference] [TranslationReference]
const string OrderMapsByDate = "options-order-maps.date"; const string OrderMapsByDate = "options-order-maps.date";
@@ -89,8 +92,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
string mapFilter; string mapFilter;
Func<MapPreview, long> orderByFunc; Func<MapPreview, long> orderByFunc;
readonly string orderByPlayer;
readonly string orderByDate;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
internal MapChooserLogic(Widget widget, ModData modData, string initialMap, internal MapChooserLogic(Widget widget, ModData modData, string initialMap,
@@ -101,8 +102,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
this.onSelect = onSelect; this.onSelect = onSelect;
allMaps = TranslationProvider.GetString(AllMaps); allMaps = TranslationProvider.GetString(AllMaps);
orderByPlayer = TranslationProvider.GetString(OrderMapsByPlayers);
orderByDate = TranslationProvider.GetString(OrderMapsByDate);
var approving = new Action(() => var approving = new Action(() =>
{ {
@@ -286,13 +285,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (orderByDropdown == null) if (orderByDropdown == null)
return; return;
var orderByPlayer = TranslationProvider.GetString(OrderMapsByPlayers);
var orderByDict = new Dictionary<string, Func<MapPreview, long>>() var orderByDict = new Dictionary<string, Func<MapPreview, long>>()
{ {
{ orderByPlayer, m => m.PlayerCount }, { orderByPlayer, m => m.PlayerCount },
{ orderByDate, m => -m.ModifiedDate.Ticks } { TranslationProvider.GetString(OrderMapsByTitle), null },
{ TranslationProvider.GetString(OrderMapsByDate), m => -m.ModifiedDate.Ticks },
}; };
orderByFunc ??= orderByDict[orderByPlayer]; orderByFunc = orderByDict[orderByPlayer];
ScrollItemWidget SetupItem(string o, ScrollItemWidget template) ScrollItemWidget SetupItem(string o, ScrollItemWidget template)
{ {
@@ -316,14 +318,18 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (!int.TryParse(mapFilter, out var playerCountFilter)) if (!int.TryParse(mapFilter, out var playerCountFilter))
playerCountFilter = -1; playerCountFilter = -1;
var maps = tabMaps[tab] var validMaps = tabMaps[tab]
.Where(m => category == null || m.Categories.Contains(category)) .Where(m => category == null || m.Categories.Contains(category))
.Where(m => mapFilter == null || .Where(m => mapFilter == null ||
(m.Title != null && m.Title.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0) || (m.Title != null && m.Title.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0) ||
(m.Author != null && m.Author.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0) || (m.Author != null && m.Author.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0) ||
m.PlayerCount == playerCountFilter) m.PlayerCount == playerCountFilter);
.OrderBy(orderByFunc)
.ThenBy(m => m.Title); IOrderedEnumerable<MapPreview> maps;
if (orderByFunc == null)
maps = validMaps.OrderBy(m => m.Title);
else
maps = validMaps.OrderBy(orderByFunc).ThenBy(m => m.Title);
scrollpanels[tab].RemoveChildren(); scrollpanels[tab].RemoveChildren();
foreach (var loop in maps) foreach (var loop in maps)

3
mods/common/languages/en.ftl
View File

@@ -467,7 +467,8 @@ dialog-delete-all-maps =
options-order-maps = options-order-maps =
.player-count = Players .player-count = Players
.date = Map Date .title = Title
.date = Date
## MissionBrowserLogic ## MissionBrowserLogic
dialog-no-video = dialog-no-video =