Skip to content

feat(gui): Add support for extra column to separate time and date in Replay Menu #2278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 6 commits into from
Feb 10, 2026
Merged

feat(gui): Add support for extra column to separate time and date in Replay Menu #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21fee81
Added logic for an additional column.
Caball009 Feb 8, 2026
eab7fee
Changed comment.
Caball009 Feb 8, 2026
1e43fa1
Added assertion for unexpected column counts.
Caball009 Feb 9, 2026
acb68e3
Optimized code.
Caball009 Feb 9, 2026
ecfd2b4
Moved and improved comment.
Caball009 Feb 9, 2026
fb09c12
Replicated in Generals.
Caball009 Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ void PopulateReplayFileListbox(GameWindow *listbox)

GadgetListBoxReset(listbox);
const Int listboxLength = GadgetListBoxGetListLength(listbox);
const Int columns = GadgetListBoxGetNumColumns(listbox);

// TheSuperHackers @tweak xezon 08/06/2025 Now shows missing maps in red color.
enum {
Expand Down Expand Up @@ -291,8 +292,8 @@ void PopulateReplayFileListbox(GameWindow *listbox)
UnicodeString replayNameToShow = createReplayName(asciistr);

// TheSuperHackers @tweak Caball009 07/02/2025 Display both time and date instead of only time.
UnicodeString displayDateTimeBuffer;
displayDateTimeBuffer.format(L"%s %s", getUnicodeTimeBuffer(header.timeVal).str(), getUnicodeDateBuffer(header.timeVal).str());
const UnicodeString displayTimeBuffer = getUnicodeTimeBuffer(header.timeVal);
const UnicodeString displayDateBuffer = getUnicodeDateBuffer(header.timeVal);

// version (no-op)

Expand Down Expand Up @@ -353,9 +354,29 @@ void PopulateReplayFileListbox(GameWindow *listbox)

const Int insertionIndex = GadgetListBoxAddEntryText(listbox, replayNameToShow, color, -1, 0);
DEBUG_ASSERTCRASH(insertionIndex >= 0, ("Expects valid index"));
GadgetListBoxAddEntryText(listbox, displayDateTimeBuffer, color, insertionIndex, 1);
GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 2);
GadgetListBoxAddEntryText(listbox, mapStr, mapColor, insertionIndex, 3);

// TheSuperHackers @info Caball009 09/02/2026 Original replay menu has 4 columns; the code now supports a future 5-column layout.
// If there aren't two columns for time and date, concatenate them for a single column.
if (columns == 4)
{
UnicodeString displayDateTimeBuffer;
displayDateTimeBuffer.format(L"%s %s", displayTimeBuffer.str(), displayDateBuffer.str());

GadgetListBoxAddEntryText(listbox, displayDateTimeBuffer, color, insertionIndex, 1);
GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 2);
GadgetListBoxAddEntryText(listbox, mapStr, mapColor, insertionIndex, 3);
}
else if (columns == 5)
{
GadgetListBoxAddEntryText(listbox, displayTimeBuffer, color, insertionIndex, 1);
GadgetListBoxAddEntryText(listbox, displayDateBuffer, color, insertionIndex, 2);
GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 3);
GadgetListBoxAddEntryText(listbox, mapStr, mapColor, insertionIndex, 4);
}
else
{
DEBUG_CRASH(("Replay menu uses %d columns; expected either 4 or 5", columns));
}

// TheSuperHackers @performance Now stops processing when the list is full.
if (insertionIndex == listboxLength - 1)
Expand Down
31 changes: 26 additions & 5 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ void PopulateReplayFileListbox(GameWindow *listbox)

GadgetListBoxReset(listbox);
const Int listboxLength = GadgetListBoxGetListLength(listbox);
const Int columns = GadgetListBoxGetNumColumns(listbox);

// TheSuperHackers @tweak xezon 08/06/2025 Now shows missing maps in red color.
enum {
Expand Down Expand Up @@ -291,8 +292,8 @@ void PopulateReplayFileListbox(GameWindow *listbox)
UnicodeString replayNameToShow = createReplayName(asciistr);

// TheSuperHackers @tweak Caball009 07/02/2025 Display both time and date instead of only time.
UnicodeString displayDateTimeBuffer;
displayDateTimeBuffer.format(L"%s %s", getUnicodeTimeBuffer(header.timeVal).str(), getUnicodeDateBuffer(header.timeVal).str());
const UnicodeString displayTimeBuffer = getUnicodeTimeBuffer(header.timeVal);
const UnicodeString displayDateBuffer = getUnicodeDateBuffer(header.timeVal);

// version (no-op)

Expand Down Expand Up @@ -353,9 +354,29 @@ void PopulateReplayFileListbox(GameWindow *listbox)

const Int insertionIndex = GadgetListBoxAddEntryText(listbox, replayNameToShow, color, -1, 0);
DEBUG_ASSERTCRASH(insertionIndex >= 0, ("Expects valid index"));
GadgetListBoxAddEntryText(listbox, displayDateTimeBuffer, color, insertionIndex, 1);
GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 2);
GadgetListBoxAddEntryText(listbox, mapStr, mapColor, insertionIndex, 3);

// TheSuperHackers @info Caball009 09/02/2026 Original replay menu has 4 columns; the code now supports a future 5-column layout.
// If there aren't two columns for time and date, concatenate them for a single column.
if (columns == 4)
{
UnicodeString displayDateTimeBuffer;
displayDateTimeBuffer.format(L"%s %s", displayTimeBuffer.str(), displayDateBuffer.str());

GadgetListBoxAddEntryText(listbox, displayDateTimeBuffer, color, insertionIndex, 1);
GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 2);
GadgetListBoxAddEntryText(listbox, mapStr, mapColor, insertionIndex, 3);
}
else if (columns == 5)
{
GadgetListBoxAddEntryText(listbox, displayTimeBuffer, color, insertionIndex, 1);
GadgetListBoxAddEntryText(listbox, displayDateBuffer, color, insertionIndex, 2);
GadgetListBoxAddEntryText(listbox, header.versionString, color, insertionIndex, 3);
GadgetListBoxAddEntryText(listbox, mapStr, mapColor, insertionIndex, 4);
}
Comment thread
Caball009 marked this conversation as resolved.
else
{
DEBUG_CRASH(("Replay menu uses %d columns; expected either 4 or 5", columns));
}

// TheSuperHackers @performance Now stops processing when the list is full.
if (insertionIndex == listboxLength - 1)
Expand Down
Loading