Skip to content
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

Jump to bottom

updating Keybindings of Keys (top right button ingame) to gridkeys #3678

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
+83 −95
Draft

updating Keybindings of Keys (top right button ingame) to gridkeys #3678

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5426194
updating Keybindings of Keys (top right button ingame)
Hazy-uhyR Sep 4, 2024
990bd74
Added Q + Minor fixes
Hazy-uhyR Sep 5, 2024
037fe1e
Update interface.json
Hazy-uhyR Sep 5, 2024
ed7ea41
minifix
Hazy-uhyR Sep 5, 2024
5594ae0
Update interface.json
Hazy-uhyR Sep 7, 2024
53ba4ea
disclaimer
Hazy-uhyR Sep 8, 2024
b2ed600
fixing font issue
Hazy-uhyR Sep 8, 2024
43b1c04
Merge branch 'master' into master
Hazy-uhyR Sep 13, 2024
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
27 changes: 12 additions & 15 deletions language/de/interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,6 @@
"menus": {
"title": "Menüs",
"settings": "Einstellungen",
"widgetsKey": "F11",
"widgets": "Widgetliste",
"share": "Einheiten/Ressourcen teilen"
},
"camera": {
"title": "Kamerabewegung",
Expand Down Expand Up @@ -319,7 +316,6 @@
"title": "Auswahlbefehle",
"defaultKey": "(nichts)",
"default": "Standardbefehl (meist Bewegen)",
"move": "Bewegen",
"attack": "Angreifen",
"stop": "Stoppen (löscht Befehlswarteschlange)",
"repair": "Reparieren",
Expand Down Expand Up @@ -348,20 +344,19 @@
"append": "Befehl am Ende der Warteschlange anfügen",
"appendKey": "Umschalttaste + (irgendein Befehl)",
"prependKey": "Leertaste + (irgendein Befehl)",
"prepend": "Befehl am Anfang der Warteschlange einfügen"
"prepend": "Befehl am Anfang der Warteschlange einfügen",
"commandSkipCurrent": "Cancel current order",
"commandCancelLast": "Cancel last order"
},
"buildOrders": {
"title": "Bauaufträge auswählen",
"selectTileKey": "(Maus)",
"selectTile": "Aus Einheitenbaumenü auswählen",
"metalKey": "Y",
"metal": "Durch Metallextraktoren schalten",
"energyKey": "X",
"energy": "Durch Energieproduktion schalten",
"intelKey": "C",
"intel": "Durch Radar/Verteidigung/etc. schalten",
"factoriesKey": "V",
"factories": "Durch Fabriken schalten",
"categorySelectorKey": "TranslateMe",
"categorySelector": "TranslateMe",
"buildingSelectorKey": "TranslateMe",
"buildingSelector": "TranslateMe",
"switchPage": "TranslateMe",
"rotateKey": "ü und +",
"rotate": "Gebäudeausrichtung ändern"
},
Expand Down Expand Up @@ -394,8 +389,10 @@
"removeAutoGroup": "Einheitstyp aus Autogruppe entfernen",
"groupKey": "(Nummer)",
"group": "Alle der Gruppe (Nummer) zugewiesenen Einheiten auswählen",
"sameTypeKey": "STRG + Y",
"sameType": "Alle Einheiten des selben Typs wie die Ausgewählte auswählen"
"sameTypeAllKey": "STRG + Y",
"sameTypeAll": "Alle Einheiten des selben Typs wie die Ausgewählte auswählen",
"sameTypeVisibleKey": "TranslateMe",
"sameTypeVisible": "TranslateMe"
},
"drawing": {
"title": "Zeichnen",
Expand Down
75 changes: 37 additions & 38 deletions language/en/interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@
},
"keybinds": {
"title": "Keybinds",
"disclaimer": "These keybinds are set by default. If you remove/replace hotkey widgets, or use your own uikeys, they might stop working!",
"howtochangekeybinds":"To change them: in Settings/Control tab, set Keybindings to Custom to create the BAR/data/uikeys.txt file.\nEdit this file and type /keyreload in chat to reload them.",
"disclaimer": "These keybinds are set by default. If you switch to a keybind preset other than Grid, keys in the 3rd column will be inaccurate!",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong information is worse than no information. Either what is shown to the player is correct or it is not shown at all.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the review.

This update is meant to be better than what we have, but not perfect. I don't have the capabilities to make it "perfect." Can we do this as a band-aid until more capable people make the tools needed for "perfection?"

"Perfection" would require getActionHotkey to accept arguments "so you can distinguish between gridmenu_category 1 and gridmenu_category 2" (#3678 (comment)), and the ability to switch the display between gridmenu and the "old" non-gridmenu way of doing things - for the "Selecting build orders" part, top right, specifically. Both of those issues are beyond my capabilities.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the record, getActionHotkey needs to be able to accept from 0 to 2 arguments so that "gridmenu_key 1 1" also can be can be distinguished from "gridmenu_key 1 2" etc.

Copy link
Contributor Author

@Hazy-uhyR Hazy-uhyR Sep 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively, I can remove the "Selecting build orders" part (except rotate keys) and half of the "Group selection" part (the "select" lines, specifically). By that point, all information on the page would be correct no matter the keybind preset, afaik.

Please confirm that I should just do that.

"howtochangekeybinds":"To change them: in Settings/Control tab, set Keybindings to Custom to create the BAR/data/uikeys.txt file.\nEdit this file and type /keyreload in chat to reload them. You can find help for keybinding in #keybinding-support on Discord.",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The game must stand on its own, we cannot require the player to consult any external reference.

"chat": {
"title": "Chat",
"send": "Send chat message",
Expand All @@ -313,7 +313,6 @@
"menus": {
"title": "Menus",
"settings": "Settings",
"share": "Share units / resources"
},
"camera": {
"title": "Camera movement",
Expand Down Expand Up @@ -361,22 +360,21 @@
},
"orders": {
"title": "Selecting orders",
"defaultKey": "(none)",
"default": "default order (usually move)",
"move": "move",
"attack": "attack",
"stop": "stop (clears order queue)",
"repair": "repair",
"reclaim": "reclaim",
"resurrect": "resurrect",
"patrol": "patrol",
"fight": "fight",
"setTarget": "set priority target",
"cancelTarget": "cancel priority target",
"wait": "wait (pause current command)",
"cloak": "cloak",
"dGun": "manual fire (dgun)",
"selfDestruct": "self-destruct"
"defaultKey": "Right Mouse",
"default": "Default order (usually move)",
"attack": "Attack",
"stop": "Stop (clears order queue)",
"repair": "Repair",
"reclaim": "Reclaim",
"resurrect": "Resurrect",
"patrol": "Patrol",
"fight": "Fight",
"setTarget": "Set priority target",
"cancelTarget": "Cancel all targets",
"wait": "Wait (pause current command)",
"cloak": "Cloak",
"dGun": "Manual fire (dgun)",
"selfDestruct": "Self-destruct"
},
"issueOrders": {
"title": "Giving selected orders",
Expand All @@ -389,23 +387,22 @@
},
"queues": {
"title": "Queueing orders",
"append": "Add order to end of order queue",
"append": "Add order to end of queue",
"appendKey": "shift + (some order)",
"prependKey": "space + (some order)",
"prepend": "Add order to start of order queue"
"prepend": "Add order to start of queue",
"commandSkipCurrent": "Cancel current order",
"commandCancelLast": "Cancel last order"
},
"buildOrders": {
"title": "Selecting build orders",
"selectTileKey": "(mouse)",
"selectTileKey": "left mouse",
"selectTile": "Select from units build-menu",
"metalKey": "z",
"metal": "Cycle through mexes",
"energyKey": "x",
"energy": "Cycle through energy production",
"intelKey": "c",
"intel": "Cycle through radar/defence/etc",
"factoriesKey": "v",
"factories": "Cycle through factories",
"categorySelectorKey": "z to v",
"categorySelector": "Select building category, then..",
"buildingSelectorKey": "q to v",
"buildingSelector": "Select specific building for placement",
"switchPage": "Switch page",
"rotateKey": "[ and ]",
"rotate": "Change facing of buildings"
},
Expand All @@ -419,17 +416,17 @@
"line": "Build in a line",
"gridKey": "shift + alt + (build order)",
"grid": "Build in a square",
"spacingUpKey": "alt+z",
"spacingUpKey": "alt + z",
"spacingUp": "Increase build spacing",
"spacingDownKey": "alt+x",
"spacingDownKey": "alt + x",
"spacingDown": "Decrease build spacing"
},
"massSelect": {
"title": "Group selection",
"allKey": "ctrl + a",
"allKey": "ctrl + e",
"all": "Select all units",
"buildersKey": "ctrl + b",
"builders": "Select all constructors",
"buildersKey": "ctrl + tab",
"builders": "Select idle constructor",
"createGroupKey": "ctrl + (num)",
"createGroup": "Add units to group (num=1,2,..)",
"createAutoGroupKey": "alt + (num)",
Expand All @@ -438,8 +435,10 @@
"removeAutoGroup": "Remove unit type from autogroup",
"groupKey": "(num)",
"group": "Select all units assigned to group (num)",
"sameTypeKey": "ctrl + z",
"sameType": "Select all units of same type as selected"
"sameTypeAllKey": "ctrl + w",
"sameTypeAll": "Select all units of same type as selected",
"sameTypeVisibleKey": "q",
"sameTypeVisible": "Select visible units of same type as selected"
},
"drawing": {
"title": "Drawing",
Expand All @@ -453,7 +452,7 @@
"console": {
"title": "Console commands",
"eraseKey": "/clearmapmarks",
"erase": "Erase all drawings and markes",
"erase": "Erase all drawings and markers",
"pauseKey": "/pause",
"pause": "Pause"
}
Expand Down
27 changes: 12 additions & 15 deletions language/fr/interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,6 @@
"menus": {
"title": "Menus",
"settings": "Paramètres",
"widgetsKey": "F11",
"widgets": "Liste des Widget",
"share": "Partager des unités / ressources"
},
"camera": {
"title": "Mouvements de caméra",
Expand Down Expand Up @@ -328,7 +325,6 @@
"title": "Raccourcis d'ordres",
"defaultKey": "(rien)",
"default": "ordre par défaut (généralement déplacer)",
"move": "Avancer",
"attack": "Attaquer",
"stop": "Stop (efface la file d'attente des commandes)",
"repair": "Réparer",
Expand Down Expand Up @@ -357,20 +353,19 @@
"append": "Ajoute un ordre à la fin de la file",
"appendKey": "SHIFT + (Ordre)",
"prependKey": "Espace + (ordre)",
"prepend": "Ajoute un ordre au début de la file"
"prepend": "Ajoute un ordre au début de la file",
"commandSkipCurrent": "Cancel current order",
"commandCancelLast": "Cancel last order"
},
"buildOrders": {
"title": "Parcourir les entités",
"selectTileKey": "(souris)",
"selectTile": "Sélectionner depuis menu de construction",
"metalKey": "z",
"metal": "Parcourir extracteurs de métal",
"energyKey": "x",
"energy": "Parcourir générateurs d'énergie",
"intelKey": "c",
"intel": "Parcourir radars/défenses/...",
"factoriesKey": "v",
"factories": "Parcourir les usines",
"categorySelectorKey": "TranslateMe",
"categorySelector": "TranslateMe",
"buildingSelectorKey": "TranslateMe",
"buildingSelector": "TranslateMe",
"switchPage": "TranslateMe",
"rotateKey": "^ et $",
"rotate": "Changer le sens du bâtiment"
},
Expand Down Expand Up @@ -403,8 +398,10 @@
"removeAutoGroup": "Supprimer du groupe automatique",
"groupKey": "(1,2,3...)",
"group": "Sélectionner les unités du groupe",
"sameTypeKey": "CTRL + Z",
"sameType": "Sélectionne toute unité du même type"
"sameTypeAllKey": "CTRL + Z",
"sameTypeAll": "Sélectionne toute unité du même type",
"sameTypeVisibleKey": "TranslateMe",
"sameTypeVisible": "TranslateMe"
},
"drawing": {
"title": "Dessin",
Expand Down
32 changes: 13 additions & 19 deletions language/zh/interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,9 @@
"prepend":"把指令加到队列开头",
"title":"队列指令",
"prependKey":"space + (指令)",
"append":"shift + (指令)"
"append":"shift + (指令)",
"commandSkipCurrent": "Cancel current order",
"commandCancelLast": "Cancel last order"
},
"orders":{
"dGun":"手动发射 (D型枪)",
Expand All @@ -239,8 +241,6 @@
"selfDestructKey":"ctrl + d",
"dGunKey":"d",
"repair":"维修",
"move":"移动",
"moveKey":"m",
"attack":"a",
"cancelTarget":"k",
"patrolKey":"f",
Expand Down Expand Up @@ -299,18 +299,15 @@
},
"buildOrders":{
"selectTile":"弹出建筑菜单",
"factoriesKey":"v",
"metal":"循环指定 金属矿采集 建筑",
"categorySelector":"循环指定 金属矿采集 建筑",
"title":"建筑者指令",
"rotate":"改变建筑朝向",
"intel":"循环指定 雷达/防御/其它 建筑",
"switchPage":"循环指定 雷达/防御/其它 建筑",
"rotateKey":"[ and ], or o",
"energyKey":"x",
"metalKey":"z",
"buildingSelectorKey":"x",
"categorySelectorKey":"z",
"selectTileKey":"左键",
"energy":"循环指定 电力生产 建筑",
"intelKey":"c",
"factories":"循环指定生产工厂"
"buildingSelector":"循环指定 电力生产 建筑",
},
"console":{
"pause":"暂停",
Expand All @@ -322,12 +319,7 @@
"title":"快捷键",
"menus":{
"settings":"设置",
"settingsKey":"F10",
"share":"共享 单位 / 资源",
"shareKey":"h",
"title":"菜单",
"widgets":"插件列表",
"widgetsKey":"F11"
},
"issueContextOrders":{
"formationOrder":"给单位(组)发出编队指令",
Expand All @@ -340,9 +332,9 @@
"removeAutoGroupKey":"alt + `",
"group":"选择编队中所有单位 (编号)",
"buildersKey":"ctrl + b",
"sameType":"选择所有同种单位",
"sameTypeAll":"选择所有同种单位",
"title":"编队选择",
"sameTypeKey":"ctrl + z",
"sameTypeAllKey":"ctrl + z",
"createGroupKey":"ctrl + (编号)",
"builders":"选择所有工程单位",
"groupKey":"(编号)",
Expand All @@ -351,7 +343,9 @@
"createAutoGroup":"向自动编队中增加兵种 (编号=1,2,..)",
"createGroup":"向编队中增加单位 (编号=1,2,..)",
"allKey":"ctrl + a",
"all":"选择所有单位"
"all":"选择所有单位",
"sameTypeVisibleKey": "TranslateMe",
"sameTypeVisible": "TranslateMe",
},
"issueBuildOrders":{
"gridKey":"shift + alt + (建造指令)",
Expand Down
17 changes: 9 additions & 8 deletions luaui/Widgets/gui_keybind_info.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ local function refreshText()
{ type = lineType.blank },
{ type = lineType.title, text = Spring.I18N('ui.keybinds.menus.title') },
{ type = lineType.key, key = getActionHotkey('options'), text = Spring.I18N('ui.keybinds.menus.settings') },
{ type = lineType.key, key = getActionHotkey('sharedialog'), text = Spring.I18N('ui.keybinds.menus.share') },
{ type = lineType.blank },
{ type = lineType.title, text = Spring.I18N('ui.keybinds.camera.title') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.camera.zoomKey'), text = Spring.I18N('ui.keybinds.camera.zoom') },
Expand Down Expand Up @@ -232,7 +231,6 @@ local function refreshText()
{ type = lineType.blank },
{ type = lineType.title, text = Spring.I18N('ui.keybinds.orders.title') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.orders.defaultKey'), text = Spring.I18N('ui.keybinds.orders.default') },
{ type = lineType.key, key = getActionHotkey('move'), text = Spring.I18N('ui.keybinds.orders.move') },
{ type = lineType.key, key = getActionHotkey('attack'), text = Spring.I18N('ui.keybinds.orders.attack') },
{ type = lineType.key, key = getActionHotkey('settarget'), text = Spring.I18N('ui.keybinds.orders.setTarget') },
{ type = lineType.key, key = getActionHotkey('repair'), text = Spring.I18N('ui.keybinds.orders.repair') },
Expand All @@ -257,18 +255,20 @@ local function refreshText()
{ type = lineType.title, text = Spring.I18N('ui.keybinds.queues.title') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.queues.appendKey'), text = Spring.I18N('ui.keybinds.queues.append') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.queues.prependKey'), text = Spring.I18N('ui.keybinds.queues.prepend')},
{ type = lineType.key, key = getActionHotkey('command_skip_current'), text = Spring.I18N('ui.keybinds.queues.commandSkipCurrent') },
{ type = lineType.key, key = getActionHotkey('command_cancel_last'), text = Spring.I18N('ui.keybinds.queues.commandCancelLast') },
{ type = lineType.blank },
{ type = lineType.blank },
{ type = lineType.title, text = Spring.I18N('ui.keybinds.buildOrders.title') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.buildOrders.selectTileKey'), text = Spring.I18N('ui.keybinds.buildOrders.selectTile')},
{ type = lineType.key, key = Spring.I18N('ui.keybinds.buildOrders.metalKey'), text = Spring.I18N('ui.keybinds.buildOrders.metal') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.buildOrders.energyKey'), text = Spring.I18N('ui.keybinds.buildOrders.energy') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.buildOrders.intelKey'), text = Spring.I18N('ui.keybinds.buildOrders.intel') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.buildOrders.factoriesKey'), text = Spring.I18N('ui.keybinds.buildOrders.factories') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.buildOrders.categorySelectorKey'), text = Spring.I18N('ui.keybinds.buildOrders.categorySelector') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.buildOrders.buildingSelectorKey'), text = Spring.I18N('ui.keybinds.buildOrders.buildingSelector') },
{ type = lineType.key, key = getActionHotkey('gridmenu_next_page'), text = Spring.I18N('ui.keybinds.buildOrders.switchPage') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.buildOrders.rotateKey'), text = Spring.I18N('ui.keybinds.buildOrders.rotate') },
{ type = lineType.blank },
{ type = lineType.title, text = Spring.I18N('ui.keybinds.issueBuildOrders.title') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.issueBuildOrders.orderKey'), text = Spring.I18N('ui.keybinds.issueBuildOrders.order') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.issueBuildOrders.deselect'), text = Spring.I18N('ui.keybinds.issueBuildOrders.deselect') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.issueBuildOrders.deselectKey'), text = Spring.I18N('ui.keybinds.issueBuildOrders.deselect') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.issueBuildOrders.lineKey'), text = Spring.I18N('ui.keybinds.issueBuildOrders.line') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.issueBuildOrders.gridKey'), text = Spring.I18N('ui.keybinds.issueBuildOrders.grid') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.issueBuildOrders.spacingUpKey'), text = Spring.I18N('ui.keybinds.issueBuildOrders.spacingUp') },
Expand All @@ -281,7 +281,8 @@ local function refreshText()
{ type = lineType.key, key = Spring.I18N('ui.keybinds.massSelect.createAutoGroupKey'), text = Spring.I18N('ui.keybinds.massSelect.createAutoGroup')},
{ type = lineType.key, key = getActionHotkey('remove_from_autogroup'), text = Spring.I18N('ui.keybinds.massSelect.removeAutoGroup')},
{ type = lineType.key, key = Spring.I18N('ui.keybinds.massSelect.groupKey'), text = Spring.I18N('ui.keybinds.massSelect.group') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.massSelect.sameTypeKey'), text = Spring.I18N('ui.keybinds.massSelect.sameType') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.massSelect.sameTypeAllKey'), text = Spring.I18N('ui.keybinds.massSelect.sameTypeAll') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.massSelect.sameTypeVisibleKey'), text = Spring.I18N('ui.keybinds.massSelect.sameTypeVisible') },
{ type = lineType.blank },
{ type = lineType.title, text = Spring.I18N('ui.keybinds.drawing.title') },
{ type = lineType.key, key = Spring.I18N('ui.keybinds.drawing.mapmarkKey'), text = Spring.I18N('ui.keybinds.drawing.mapmark') },
Expand Down