Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / gui / guiKeyChangeMenu.cpp

diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
index 84678b6290ea678cf64d62259cab28977503031c..b4ee8b72886e5c4bda3eed8af0b712656260dd37 100644 (file)
--- a/src/gui/guiKeyChangeMenu.cpp
+++ b/src/gui/guiKeyChangeMenu.cpp
@@ -59,6 +59,7 @@ enum
        GUI_ID_KEY_SNEAK_BUTTON,
        GUI_ID_KEY_DROP_BUTTON,
        GUI_ID_KEY_INVENTORY_BUTTON,
+       GUI_ID_KEY_ENDERCHEST_BUTTON,
        GUI_ID_KEY_HOTBAR_PREV_BUTTON,
        GUI_ID_KEY_HOTBAR_NEXT_BUTTON,
        GUI_ID_KEY_MUTE_BUTTON,
@@ -72,9 +73,18 @@ enum
        GUI_ID_KEY_CHATLOG_BUTTON,
        GUI_ID_KEY_HUD_BUTTON,
        GUI_ID_KEY_FOG_BUTTON,
+       GUI_ID_KEY_CHEAT_MENU_BUTTON,
        GUI_ID_KEY_DEC_RANGE_BUTTON,
        GUI_ID_KEY_INC_RANGE_BUTTON,
        GUI_ID_KEY_AUTOFWD_BUTTON,
+       GUI_ID_KEY_KILLAURA_BUTTON,
+       GUI_ID_KEY_FREECAM_BUTTON,
+       GUI_ID_KEY_SCAFFOLD_BUTTON,
+       GUI_ID_KEY_SELECT_UP_BUTTON,
+       GUI_ID_KEY_SELECT_DOWN_BUTTON,
+       GUI_ID_KEY_SELECT_LEFT_BUTTON,
+       GUI_ID_KEY_SELECT_RIGHT_BUTTON,
+       GUI_ID_KEY_SELECT_CONFIRM_BUTTON,
        // other
        GUI_ID_CB_AUX1_DESCENDS,
        GUI_ID_CB_DOUBLETAP_JUMP,
@@ -121,9 +131,9 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 
        const float s = m_gui_scale;
        DesiredRect = core::rect<s32>(
-               screensize.X / 2 - 835 * s / 2,
+               screensize.X / 2 - 1113 * s / 2,
                screensize.Y / 2 - 430 * s / 2,
-               screensize.X / 2 + 835 * s / 2,
+               screensize.X / 2 + 1113 * s / 2,
                screensize.Y / 2 + 430 * s / 2
        );
        recalculateAbsolutePosition(false);
@@ -421,6 +431,7 @@ void GUIKeyChangeMenu::init_keys()
        this->add_key(GUI_ID_KEY_SNEAK_BUTTON,     wgettext("Sneak"),            "keymap_sneak");
        this->add_key(GUI_ID_KEY_DROP_BUTTON,      wgettext("Drop"),             "keymap_drop");
        this->add_key(GUI_ID_KEY_INVENTORY_BUTTON, wgettext("Inventory"),        "keymap_inventory");
+       this->add_key(GUI_ID_KEY_ENDERCHEST_BUTTON,wgettext("Enderchest"),               "keymap_enderchest");
        this->add_key(GUI_ID_KEY_HOTBAR_PREV_BUTTON,wgettext("Prev. item"),      "keymap_hotbar_previous");
        this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,wgettext("Next item"),       "keymap_hotbar_next");
        this->add_key(GUI_ID_KEY_ZOOM_BUTTON,      wgettext("Zoom"),             "keymap_zoom");
@@ -445,4 +456,13 @@ void GUIKeyChangeMenu::init_keys()
        this->add_key(GUI_ID_KEY_HUD_BUTTON,       wgettext("Toggle HUD"),       "keymap_toggle_hud");
        this->add_key(GUI_ID_KEY_CHATLOG_BUTTON,   wgettext("Toggle chat log"),  "keymap_toggle_chat");
        this->add_key(GUI_ID_KEY_FOG_BUTTON,       wgettext("Toggle fog"),       "keymap_toggle_fog");
+       this->add_key(GUI_ID_KEY_CHEAT_MENU_BUTTON,wgettext("Toggle C. Menu"),"keymap_toggle_cheat_menu");
+       this->add_key(GUI_ID_KEY_KILLAURA_BUTTON,  wgettext("Killaura"),  "keymap_toggle_killaura");
+       this->add_key(GUI_ID_KEY_FREECAM_BUTTON,   wgettext("Freecam"),    "keymap_toggle_freecam");
+       this->add_key(GUI_ID_KEY_SCAFFOLD_BUTTON,  wgettext("Scaffold"),    "keymap_toggle_scaffold");
+       this->add_key(GUI_ID_KEY_SELECT_UP_BUTTON, wgettext("C. Menu Up"),    "keymap_select_up");
+       this->add_key(GUI_ID_KEY_SELECT_DOWN_BUTTON,wgettext("C. Menu Down"), "keymap_select_down");
+       this->add_key(GUI_ID_KEY_SELECT_LEFT_BUTTON,wgettext("C. Menu Left"), "keymap_select_left");
+       this->add_key(GUI_ID_KEY_SELECT_RIGHT_BUTTON,wgettext("C. Menu Right"),"keymap_select_right");
+       this->add_key(GUI_ID_KEY_SELECT_CONFIRM_BUTTON,wgettext("C. Menu Enter"),"keymap_select_confirm");
 }