change the html manual to describe shortcuts always as...

..."modifier+key" instead of a wild mix where "modifier-key" dominates

this change gets things uniform and in sync with what is shown in-game
(plus it makes sense to have a '+' used when >1 key have to be pushed
at the same time) the po files are *not* updated yet...
This commit is contained in:
Nils Kneuper 2011-03-27 21:23:38 +00:00
parent 6dab616793
commit 5fe5072040

View file

@ -341,7 +341,7 @@ can recall experienced units that survived earlier scenarios. From here,
you can start to build your army to conquer the enemy.
The first thing you will probably want to do is recruit your first
unit. Press `Ctrl-R` (or right click on an empty castle hex and select
unit. Press `Ctrl+r` (or right click on an empty castle hex and select
"Recruit") and you will be able to recruit a unit from a list of all
the units available to you. Each recruit is placed on an empty castle
hex. Once you have filled the castle, you cannot recruit any more
@ -433,54 +433,54 @@ Right click Context menu, cancel action
Middle click Center on pointer location
Escape Exit game, exit menu, cancel message
Ctrl-s Save game
Ctrl-o Load game
Ctrl-p Go to Preferences menu
Ctrl-q Quit game
Ctrl-f Toggle full screen/windowed mode
Ctrl-Alt-m Toggle muting of game sounds
Ctrl+s Save game
Ctrl+o Load game
Ctrl+p Go to Preferences menu
Ctrl+q Quit game
Ctrl+f Toggle full screen/windowed mode
Ctrl+Alt+m Toggle muting of game sounds
+ Zoom in
- Zoom out
0 Reset zoom to default
Ctrl+e Toggle ellipses
Ctrl-g Toggle grid
Ctrl+g Toggle grid
Ctrl-a Toggle accelerated game mode
Ctrl+a Toggle accelerated game mode
Holding Shift Toggle between accelerated and normal game mode while pressed (temporary!)
Ctrl-j Show scenario objectives
Ctrl+j Show scenario objectives
s Show statistics
Alt-s Show status table
Alt-u Show unit list
Alt+s Show status table
Alt+u Show unit list
l Move to leader unit
Shift-s Update shroud now
Shift+s Update shroud now
------------------------------------------------------------------------------
.Unit and turn specific hotkeys
`--------------`--------------------------------------------------------------
Ctrl-r Recruit unit
Ctrl-Alt-r Repeat last recruit
Alt-r Recall unit
Ctrl+r Recruit unit
Ctrl+Alt+r Repeat last recruit
Alt+r Recall unit
Ctrl-n Rename unit
Ctrl+n Rename unit
d Show the description of the currently selected unit
t Continue interrupted unit move
u Undo last move (only deterministic moves can be undone)
r Redo move
n Cycle through units that have movement left
Shift-n Cycle through units that have movement left, in reverse order
Shift+n Cycle through units that have movement left, in reverse order
Ctrl-v Show enemy moves (where the enemy can move next turn)
Ctrl-b Show potential enemy moves, if your units were not on the map
Ctrl+v Show enemy moves (where the enemy can move next turn)
Ctrl+b Show potential enemy moves, if your units were not on the map
1-7 Show how far currently selected unit can move in that many turns
Space End unit turn and cycle to next unit that has movement left
Shift-Space Make currently selected unit hold position (end its movement)
Ctrl-Space End this player's turn
Shift+Space Make currently selected unit hold position (end its movement)
Ctrl+Space End this player's turn
------------------------------------------------------------------------------
.Whiteboard specific hotkeys
@ -495,18 +495,18 @@ Ctrl+y Execute all actions
.Multiplayer specific hotkeys
`--------------`--------------------------------------------------------------
m Message another player (in multiplayer)
Ctrl-m Message your allies (in multiplayer)
Alt-m Message everyone in the game (in multiplayer)
Alt-c View chat log
Ctrl+m Message your allies (in multiplayer)
Alt+m Message everyone in the game (in multiplayer)
Alt+c View chat log
Ctrl+x Clear messages
------------------------------------------------------------------------------
.Miscellaneous hotkeys
`--------------`--------------------------------------------------------------
Ctrl-c Clear onscreen labels
Ctrl+c Clear onscreen labels
/ Search (find label or unit by name)
Alt-l Attach a text label to a terrain hex
Ctrl-l Set team label
Alt+l Attach a text label to a terrain hex
Ctrl+l Set team label
: http://www.wesnoth.org/wiki/CommandMode[Command mode]
F5 Refresh Cache
@ -519,8 +519,8 @@ those:
.Miscellaneous hotkeys
`--------------`--------------------------------------------------------------
Cmd-w Quit game
Cmd-, Go to Preferences menu
Cmd+w Quit game
Cmd+, Go to Preferences menu
Ctrl+F5 Refresh Cache
Option+Space End this player's turn
------------------------------------------------------------------------------
@ -536,8 +536,8 @@ GamingButton A Recruit unit
GamingButton B Undo last move (only deterministic moves can be undone)
GamingButton X Cycle through units that have movement left
GamingButton Y Recall unit
Alt-GamingButton Y Move action down queue
Alt-GamingButton X Move action up queue
Alt+GamingButton Y Move action down queue
Alt+GamingButton X Move action up queue
------------------------------------------------------------------------------
Gold