edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-09 09:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8871 from BlaiZephyr/fix_inconsistency

Browse source 
fix inconsistent quickaction tooltips
This commit is contained in:
Dennis Felsing 2024-09-01 21:17:33 +00:00 committed by GitHub
parent e17da385dd a017190753
commit 157498799e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/game/editor/quick_actions.h
View file

@ -14,7 +14,7 @@ REGISTER_QUICK_ACTION(
ALWAYS_FALSE, ALWAYS_FALSE,
[&]() -> bool { return MapView()->MapGrid()->IsEnabled(); }, [&]() -> bool { return MapView()->MapGrid()->IsEnabled(); },
DEFAULT_BTN, DEFAULT_BTN,
"[ctrl+g] Toggle Grid") "[Ctrl+G] Toggle Grid.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesAir, GameTilesAir,
"Game tiles: Air", "Game tiles: Air",
@ -22,7 +22,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesHookable, GameTilesHookable,
"Game tiles: Hookable", "Game tiles: Hookable",
@ -30,7 +30,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesDeath, GameTilesDeath,
"Game tiles: Death", "Game tiles: Death",
@ -38,7 +38,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesUnhookable, GameTilesUnhookable,
"Game tiles: Unhookable", "Game tiles: Unhookable",
@ -46,7 +46,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesHookthrough, GameTilesHookthrough,
"Game tiles: Hookthrough", "Game tiles: Hookthrough",
@ -54,7 +54,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesFreeze, GameTilesFreeze,
"Game tiles: Freeze", "Game tiles: Freeze",
@ -62,7 +62,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesUnfreeze, GameTilesUnfreeze,
"Game tiles: Unfreeze", "Game tiles: Unfreeze",
@ -70,7 +70,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesDeepFreeze, GameTilesDeepFreeze,
"Game tiles: Deep Freeze", "Game tiles: Deep Freeze",
@ -78,7 +78,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesDeepUnfreeze, GameTilesDeepUnfreeze,
"Game tiles: Deep Unfreeze", "Game tiles: Deep Unfreeze",
@ -86,7 +86,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesBlueCheckTele, GameTilesBlueCheckTele,
"Game tiles: Blue Check Tele", "Game tiles: Blue Check Tele",
@ -94,7 +94,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesRedCheckTele, GameTilesRedCheckTele,
"Game tiles: Red Check Tele", "Game tiles: Red Check Tele",
@ -102,7 +102,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesLiveFreeze, GameTilesLiveFreeze,
"Game tiles: Live Freeze", "Game tiles: Live Freeze",
@ -110,7 +110,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
GameTilesLiveUnfreeze, GameTilesLiveUnfreeze,
"Game tiles: Live Unfreeze", "Game tiles: Live Unfreeze",
@ -118,11 +118,23 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !CanFillGameTiles(); }, [&]() -> bool { return !CanFillGameTiles(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Constructs game tiles from this layer") "Constructs game tiles from this layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
AddGroup, "Add group", [&]() { AddGroup(); }, ALWAYS_FALSE, ALWAYS_FALSE, DEFAULT_BTN, "Adds a new group") AddGroup,
"Add group",
[&]() { AddGroup(); },
ALWAYS_FALSE,
ALWAYS_FALSE,
DEFAULT_BTN,
"Adds a new group.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
Refocus, "Refocus", [&]() { MapView()->Focus(); }, ALWAYS_FALSE, ALWAYS_FALSE, DEFAULT_BTN, "[HOME] Restore map focus") Refocus,
"Refocus",
[&]() { MapView()->Focus(); },
ALWAYS_FALSE,
ALWAYS_FALSE,
DEFAULT_BTN,
"[HOME] Restore map focus.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
Proof, Proof,
"Proof", "Proof",
@ -140,7 +152,7 @@ REGISTER_QUICK_ACTION(
ALWAYS_FALSE, ALWAYS_FALSE,
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Saves the current map under a new name (ctrl+shift+s)") "[Ctrl+Shift+S] Saves the current map under a new name.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
LoadCurrentMap, LoadCurrentMap,
"Load Current Map", "Load Current Map",
@ -158,7 +170,7 @@ REGISTER_QUICK_ACTION(
ALWAYS_FALSE, ALWAYS_FALSE,
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Opens the current in game map for editing (ctrl+alt+l)") "[Ctrl+Alt+L] Opens the current in game map for editing.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
Envelopes, Envelopes,
"Envelopes", "Envelopes",
@ -174,7 +186,7 @@ REGISTER_QUICK_ACTION(
ALWAYS_FALSE, ALWAYS_FALSE,
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Load a new image to use in the map") "Load a new image to use in the map.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
LayerPropAddImage, LayerPropAddImage,
"Layer: Add Image", "Layer: Add Image",
@ -182,7 +194,7 @@ REGISTER_QUICK_ACTION(
[&]() -> bool { return !IsNonGameTileLayerSelected(); }, [&]() -> bool { return !IsNonGameTileLayerSelected(); },
ALWAYS_FALSE, ALWAYS_FALSE,
DEFAULT_BTN, DEFAULT_BTN,
"Pick mapres image for currently selected layer") "Pick mapres image for currently selected layer.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
ShowInfoOff, ShowInfoOff,
"Show Info: Off", "Show Info: Off",
@ -193,7 +205,7 @@ REGISTER_QUICK_ACTION(
ALWAYS_FALSE, ALWAYS_FALSE,
[&]() -> bool { return m_ShowTileInfo == SHOW_TILE_OFF; }, [&]() -> bool { return m_ShowTileInfo == SHOW_TILE_OFF; },
DEFAULT_BTN, DEFAULT_BTN,
"Do not show tile information") "Do not show tile information.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
ShowInfoDec, ShowInfoDec,
"Show Info: Dec", "Show Info: Dec",
@ -204,7 +216,7 @@ REGISTER_QUICK_ACTION(
ALWAYS_FALSE, ALWAYS_FALSE,
[&]() -> bool { return m_ShowTileInfo == SHOW_TILE_DECIMAL; }, [&]() -> bool { return m_ShowTileInfo == SHOW_TILE_DECIMAL; },
DEFAULT_BTN, DEFAULT_BTN,
"[ctrl+i] Show tile information") "[Ctrl+I] Show tile information.")
REGISTER_QUICK_ACTION( REGISTER_QUICK_ACTION(
ShowInfoHex, ShowInfoHex,
"Show Info: Hex", "Show Info: Hex",
@ -215,7 +227,7 @@ REGISTER_QUICK_ACTION(
ALWAYS_FALSE, ALWAYS_FALSE,
[&]() -> bool { return m_ShowTileInfo == SHOW_TILE_HEXADECIMAL; }, [&]() -> bool { return m_ShowTileInfo == SHOW_TILE_HEXADECIMAL; },
DEFAULT_BTN, DEFAULT_BTN,
"[ctrl+shift+i] Show tile information in hexadecimal") "[Ctrl+Shift+I] Show tile information in hexadecimal.")
#undef ALWAYS_FALSE #undef ALWAYS_FALSE
#undef DEFAULT_BTN #undef DEFAULT_BTN