Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

something is wrong with olistsingle, olistmultiple

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

The changes in this diff arent so worthy for concern if it wasnt a pattern to ignore default.cfg that had led to many mistakes before that would have been found if carefully compared and always cosidered.

Isn't it actually more of a problem that people change keys in the default.cfg file but forget to update the intro.txt file?

Why describe different behavior for the same hotkey in different places?

Well I described the problem already multiple times. Some sentence mentions that the page is "shown", other places mention that the page is "toggled". I didn't know that the civ dialog should be able to toggle and even committed a bug changing the behavior that way without noticing (D2273), and default.cfg still says

structree = "Alt+Shift+T" ; Show structure tree
civinfo = "Alt+Shift+H" ; Show civilization info

while you propose to change it in Intro.txt to:

Alt + Shift + T – Toggle the “Structure Tree” window
Alt + Shift + H – Toggle the “Civilizations” (“History”) window

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

By the way, shouldn't there be a hotkey to open the Manual?

Why change anticlockwise to counterclockwise in one file but not in the other?
There actually was no argument provided why it was right to change the string in D1744, but I suppose it's because the word is more common, regardless whether you're a developer or player.

The reason is “anticlockwise” is English and “counterclockwise” is American. Spelling and vocabulary differences matter for translations, but not really for comments in code.

Why changing building to structure in one file but not the other?

Well, I suppose I could change that and similar things in the default.cfg too, but I still think it would be better to do that in a separate patch.

Why describe different behavior for the same hotkey in different places?

?

Why change anticlockwise to counterclockwise in one file but not in the other?
There actually was no argument provided why it was right to change the string in D1744, but I suppose it's because the word is more common, regardless whether you're a developer or player.
It was an exact copy of the same sentence, so I don't see why one of the files would just not be updated when we already can identify the location quickly inside the known file.
Why changing building to structure in one file but not the other?
Why describe different behavior for the same hotkey in different places?
The argument at least applies to all of the sentences changed in this diff.

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

• put window names inside quotation marks

Build failure - The Moirai have given mortals hearts that can endure.

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

One example, default.cfg has:

screenshot = F2                          ; Take PNG screenshot
bigscreenshot = "Shift+F2"               ; Take large BMP screenshot

and intro.txt has:

F2 – Take screenshot (in .png format, location is displayed in the top left of the GUI after the file has been saved, and can also be seen in the console/logs if you miss it there)
Shift + F2 – Take huge screenshot (6400×4800 pixels, in .bmp format, location is displayed in the top left of the GUI after the file has been saved, and can also be seen in the console/logs if you miss it there)

In my honest opinion neither replacing the concise former with the verbose former nor vice versa would be an improvement.

Build failure - The Moirai have given mortals hearts that can endure.

Single, Multiple class design
Not synchronised with js
OList is Single for now

In D2305#96247, @Nescio wrote:

The same changes should be applied to default.cfg in the same patch I suppose?

• it includes many other settings not in the manual
• it doesn't list many of the manual entries (esp. those that involve clicking or specify multiple cases)
• completely different order
• different format ("code = key ; comment" instead of "key: function")

These points are irrelevant to the argument that the sentences are the exact same in both places, targetted at the same reader, expressing the same information, the patch proposing to correct or improve that information based on an argument that applies to the instances of the sentence alike; fixing one instance of the sentences because its better but then leaving the other copies of the sentences with the less correct or less accurate information.

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

That was the part that I was wondering about in D2273.

Yes, I saw your post there today, which prompted me to change it again in this patch.

The same changes should be applied to default.cfg in the same patch I suppose?

Actually I had a look at the binaries/data/config/default.cfg file, but quickly noticed it's too different from the gui/manual/intro.txt file:

• it includes many other settings not in the manual
• it doesn't list many of the manual entries (esp. those that involve clicking or specify multiple cases)
• completely different order
• different format ("code = key ; comment" instead of "key: function")
• file is for developers, does not really contain user-facing text strings
• already out of sync prior to D1719

Taking everything together, I concluded it's too much work and not really necessarily a good idea to update the default.cfg to match the intro.txt file.

The same changes should be applied to default.cfg in the same patch I suppose?

intro.txt, default.cfg and HotKeys should be kept in sync

Builds, tests passed, jenkins tests are ok, feature looks good, I do not see more problems in code

Successful build - Chance fights ever on the side of the prudent.

Build failure - The Moirai have given mortals hearts that can endure.

Successful build - Chance fights ever on the side of the prudent.

builds in debug and without pch release

Build failure - The Moirai have given mortals hearts that can endure.

Successful build - Chance fights ever on the side of the prudent.

In D2295#96171, @wraitii wrote:

In D2295#96153, @elexis wrote:

Moving hotkey.js hotkey.xml into a new hotkey folder would allow future GUI test pages to be distinguished, like we have in public/gui/ and mod/gui/. (Current directory contents gui_page.rng gui.rng hotkey.js hotkey.xml page_hotkey.xml)

Ah, I think I understand why - you mean that we can have different schemas then, correct?

Successful build - Chance fights ever on the side of the prudent.

• Add missing wxUnused(evt) to fix the warning reported by @Angen
• Add a missing include to fix "There is an unknown macro here somewhere. Configuration is required. If BEGIN_EVENT_TABLE is a macro then please configure it." from CPPCHECK

Successful build - Chance fights ever on the side of the prudent.

From Debug build

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Fix broken indent on brace.

Build failure - The Moirai have given mortals hearts that can endure.

Add missing final newlines.

Successful build - Chance fights ever on the side of the prudent.

Rebase + Context

Can any of this includes be replaced by a forward include ?

I see two cases when to add header to precompiled.

1. It is included in a lot of files ( what means more than 15 with small files)
2. It is big file in terms of code and other includes and is used more than 5 times.

The patch looks good to me. Though I didn't test it.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

Rebased.

In D2295#96153, @elexis wrote:

Sorry that I was too lazy to review the original patch, one needs to know the circumstances of the hotkey code which takes some time to get back into again.

TBH that's fine. Your time, like mine, is limited. You'll never have the time to really look at everything in advance, but if you look at what gets committed that optimises your time and the code still gets to where it needs to be.
Indeed this patch was fairly tricky, I too had to dive deep again before committing because I'd forgotten why it worked.

Successful build - Chance fights ever on the side of the prudent.

Successful build - Chance fights ever on the side of the prudent.

INVALID_ENTITY, INVALID_PLAYER.