This is the last try for lint...

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

diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
index 3f270fc7adbcc11c0f3d074d5dbf8b9bcaa0dd08..94fe0074a343ec82c564705bc8d6dbe300b38f1e 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,19 @@ 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_NEXT_ITEM_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,
@@ -82,8 +93,10 @@ enum
 };
 
 GUIKeyChangeMenu::GUIKeyChangeMenu(gui::IGUIEnvironment* env,
-                               gui::IGUIElement* parent, s32 id, IMenuManager *menumgr) :
-GUIModalMenu(env, parent, id, menumgr)
+               gui::IGUIElement* parent, s32 id, IMenuManager *menumgr,
+               ISimpleTextureSource *tsrc) :
+               GUIModalMenu(env, parent, id, menumgr),
+               m_tsrc(tsrc)
 {
        init_keys();
 }
@@ -119,9 +132,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);
@@ -157,7 +170,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
                        core::rect<s32> rect(0, 0, 100 * s, 30 * s);
                        rect += topleft + v2s32(offset.X + 150 * s, offset.Y - 5 * s);
                        const wchar_t *text = wgettext(k->key.name());
-                       k->button = GUIButton::addButton(Environment, rect, this, k->id, text);
+                       k->button = GUIButton::addButton(Environment, rect, m_tsrc, this, k->id, text);
                        delete[] text;
                }
                if ((i + 1) % KMaxButtonPerColumns == 0) {
@@ -217,14 +230,14 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
                core::rect<s32> rect(0, 0, 100 * s, 30 * s);
                rect += topleft + v2s32(size.X / 2 - 105 * s, size.Y - 40 * s);
                const wchar_t *text =  wgettext("Save");
-               GUIButton::addButton(Environment, rect, this, GUI_ID_BACK_BUTTON, text);
+               GUIButton::addButton(Environment, rect, m_tsrc, this, GUI_ID_BACK_BUTTON, text);
                delete[] text;
        }
        {
                core::rect<s32> rect(0, 0, 100 * s, 30 * s);
                rect += topleft + v2s32(size.X / 2 + 5 * s, size.Y - 40 * s);
                const wchar_t *text = wgettext("Cancel");
-               GUIButton::addButton(Environment, rect, this, GUI_ID_ABORT_BUTTON, text);
+               GUIButton::addButton(Environment, rect, m_tsrc, this, GUI_ID_ABORT_BUTTON, text);
                delete[] text;
        }
 }
@@ -358,7 +371,7 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                {
                        if (!canTakeFocus(event.GUIEvent.Element))
                        {
-                               dstream << "GUIMainMenu: Not allowing focus change."
+                               infostream << "GUIKeyChangeMenu: Not allowing focus change."
                                << std::endl;
                                // Returning true disables focus change
                                return true;
@@ -419,6 +432,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");
@@ -443,4 +457,14 @@ 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_NEXT_ITEM_BUTTON, wgettext("NextItem"),    "keymap_toggle_next_item");
+       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");
 }