Freeciv

Some differences between the GTK and Qt clients should be resolved by
changing the clients.

1
S: un(S)entry all units on tile
Is Ctrl/Meta Shift D in Qt
"shift+s" is GTK only, Qt uses it for multiplayer_menu item "Set/Unset rally point",
and could use "shift+r" instead.

2
Qt has Ctrl/Meta F "Toggle city full bar visibility",
GTK View menu item "City Full Bar" lacking shortcut key,
because Ctrl/Meta F is GTK "Find City" menu item. GTK could use
Ctrl/Meta C for "Find _City" and then use Ctrl/Meta F for
"City _Full Bar" kike Qt.

3
Qt missing Meta-T shortcut for "Tax Rates..." menu item

4
Qt missing Shift-G shortcut for "Revolution" menu item

5
Qt has Ctrl/Meta + shift + J "Load Lua script"
GTK has menu item "Client _Lua Script" with no shortcut.

6
z: select only first unit of selected group
is shift+z in qt

7
Ctrl-Y: show/hide city outlines
Qt lacking this shortcut key.

These items should be resolved by changing helpdata.txt.

1
Ctrl+M: connect current and target tile with M)aglev
missing (

2
p: clean (p)ollution (settler/worker units)\n\
should be, in >= 3.2
p: clean (p)ollution/nuclear fallout (settler/worker units)\n\

3
5: focus on previous unit
5/Begin(GTK): focus on previous unit
5/Clear(Qt): focus on previous unit

4
1/End: move south-west
2/Down: move south
3/Page Down: move south-east
4/Left: move west (not on hexagonal map topology)
6/Right: move east (not on hexagonal map topology)
7/Home: move north-west
8/Up: move north
9/Page Up: move north-east

5
Some clients support zooming/scaling the map graphics with the + and - keys.
GTK & Qt clients support zooming/scaling the map graphics with the keypad + and - keys, in addition to their View menu items for zooming.

6
Some clients support audio volume control with Shift-+ and Shift-- keys.
GTK clients support audio volume control with Shift-+ and Shift-- keys.

7
Shift-home: center view on capital
Shift-home: center view on capital (GTK)

8
Ctrl-B: show/hide national borders
Ctrl-D: show/hide city trade routes
Ctrl-G: show/hide map grid lines
Ctrl-N: show/hide city names
Ctrl-P: show/hide city production
Ctrl-O: show/hide city growth
Ctrl-V: show/hide city output values
Ctrl-Y: show/hide city outlines
This whole section duplicates menus and
has Ctrl instead of Ctrl/Meta, and should go away

9
Center-click, Alt-left-click: Show tile info
Center-click: Show tile info
Alt-left-click(GTK): Show tile info

10
Ctrl-center-click: Wake up sentried units
Ctrl-center-click(GTK): Wake up sentried units

11
Quick unit selection:
Quick unit selection (GTK):

12
Left-click, Shift-left-click, and Right-click have the same functions as they do on the main map.
Left-click(GTK), Shift-left-click(GTK), and Right-click have the same functions as they do on the main map.

13
Dialogs and Reports: ====================

This whole section should be replaced with -

Dialogs (GTK): ====================
Shift-Ctrl-L: open Worklists dialog
Shift-Ctrl-R: open Rally point dialog

details of Dialogs and Reports: section -

F1: show Map View
     F2: open Units Report
     F3: open Nations Report
     F4: open Cities Report
     F5: open Economy Report
     F6: open Research Report
     F7: open World Wonders
     F8: open Top Five Cities
     F9: open Messages dialog
    F11: open Demographics
    F12: open Spaceship
these duplicate menus and should go away

Ctrl-F:       open Find City dialog
Ctrl-F(GTK):   open Find City dialog

Shift-Ctrl-L: open Worklists dialog
Shift-Ctrl-L(GTK): open Worklists dialog

Ctrl-T:       open Tax/Lux/Sci Rates dialog
Is menu item for both clients, Qt missing Meta-T shortcut

Shift-Ctrl-G: open Revolution dialog
Is menu item for both clients, Qt missing Shift-G shortcut

Shift-Ctrl-I: open Infrapoints dialog
go away, not in the source code

Shift-Ctrl-R: open Rally point dialog
Shift-Ctrl-R(GTK): open Rally point dialog

It might be better to split the client changes into a separate issue so they could have their own separate patch.
Also make it easier to get the helpdata.txt changes done before the upcoming string freeze.

More items -

clients
8
a: (a)uto-settler (settler/worker units)
GTK menu item is "Auto Settler", should be changed to "Auto Worker" to match Qt client

helpdata.txt
14
a: (a)uto-settler (settler/worker units)
a: (a)uto-worker (settler/worker/engineer units)

Dean Brown wrote in #note-6:

Thought of something else to add - arrow keys for move west/east apply to rectangular topology only.

Difference between hex and isohex is whether north <-> south or east <-> west directions exist, i.e., neither is north/south direction always present.

Well, have to think about the fact that north <-> south is not always the same as up <-> down (not sure if east <.> west is always the same as left <-> right)

Guess I need to learn more about the difference between hex and isohex.

Maybe a more generic way to handle this is to add to the "Unit Movement:" line something like "(Some of these may not apply in some topologies.)

Now I've done the research I should have done before, looks to me that north <-> south is always the same as up <-> down, and east <-> west is always the same as left <-> right in all topologies. Here's a better version, with -

  1,End:       move south-west\n\
  2,Down:      move south (not when hex topology)\n\
  3,Page Down: move south-east\n\
  4,Left:      move west (not when iso-hex topology)\n\
  6,Right:     move east (not when iso-hex topology)\n\
  7,Home:      move north-west\n\
  8,Up:        move north (not when hex topology)\n\
  9,Page Up:   move north-east\n\

In the Game Settings option dialog "Map topology" has pop-up help which also uses "Hex" and "Iso-hex".

I think in (square) isometric, up is northwest and down is southeast. That's at least what I remember from oriented units (cimpletoon). "North" facing unit is looking towards upper right corner of the screen. I've sometimes thought that we should have a compass rose showing the directions.

So maybe we should not use compass points (north etc), but directions on the screen (up etc) in this keys documentation, as the keys are constant for the latter but not for the former.

Well, to add the confusion, you can use non-isometric tileset for isometric ("rotated") map, and vice versa.

We probably need to split this ticket to smaller pieces. Updating movement keys could be one ticket.

That's a good idea - the 2 tickets would not have interfering patches, so nothing blocking. For this ticket, can use the original patches 1293-S3_1.patch AND 1293.patch.

Created #1496 as a spinoff.

OOPS, wrong - they would have interfering patches, so one needs to block the other.