Mention world location at server startup at action level

[dragonfireclient.git] / src / guiKeyChangeMenu.cpp

diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index 4a92e61e9313dc2d41573ca5957af4bf5297044a..4e04fccf0e1406c0268dcf2fc8bd58908a9e95d3 100644 (file)
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -202,6 +202,21 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
                                wgettext(key_jump.name()));
        }
 
+       offset += v2s32(0, 25);
+       {
+               core::rect < s32 > rect(0, 0, 100, 20);
+               rect += topleft + v2s32(offset.X, offset.Y);
+               Environment->addStaticText(wgettext("Drop"), rect, false, true, this, -1);
+               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+       }
+
+       {
+               core::rect < s32 > rect(0, 0, 100, 30);
+               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
+               this->dropbtn = Environment->addButton(rect, this, GUI_ID_KEY_DROP_BUTTON,
+                               wgettext(key_drop.name()));
+       }
+
        offset += v2s32(0, 25);
        {
                core::rect < s32 > rect(0, 0, 100, 20);
@@ -246,7 +261,20 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
                this->cmd = Environment->addButton(rect, this, GUI_ID_KEY_CMD_BUTTON,
                                wgettext(key_cmd.name()));
        }
+       offset += v2s32(0, 25);
+       {
+               core::rect < s32 > rect(0, 0, 100, 20);
+               rect += topleft + v2s32(offset.X, offset.Y);
+               Environment->addStaticText(wgettext("Console"), rect, false, true, this, -1);
+               //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+       }
 
+       {
+               core::rect < s32 > rect(0, 0, 100, 30);
+               rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
+               this->console = Environment->addButton(rect, this, GUI_ID_KEY_CONSOLE_BUTTON,
+                               wgettext(key_console.name()));
+       }
 
        //next col
        offset = v2s32(250, 40);
@@ -352,9 +380,11 @@ bool GUIKeyChangeMenu::acceptInput()
        g_settings->set("keymap_right", key_right.sym());
        g_settings->set("keymap_jump", key_jump.sym());
        g_settings->set("keymap_sneak", key_sneak.sym());
+       g_settings->set("keymap_drop", key_drop.sym());
        g_settings->set("keymap_inventory", key_inventory.sym());
        g_settings->set("keymap_chat", key_chat.sym());
        g_settings->set("keymap_cmd", key_cmd.sym());
+       g_settings->set("keymap_console", key_console.sym());
        g_settings->set("keymap_rangeselect", key_range.sym());
        g_settings->set("keymap_freemove", key_fly.sym());
        g_settings->set("keymap_fastmove", key_fast.sym());
@@ -371,9 +401,11 @@ void GUIKeyChangeMenu::init_keys()
        key_right = getKeySetting("keymap_right");
        key_jump = getKeySetting("keymap_jump");
        key_sneak = getKeySetting("keymap_sneak");
+       key_drop = getKeySetting("keymap_drop");
        key_inventory = getKeySetting("keymap_inventory");
        key_chat = getKeySetting("keymap_chat");
        key_cmd = getKeySetting("keymap_cmd");
+       key_console = getKeySetting("keymap_console");
        key_range = getKeySetting("keymap_rangeselect");
        key_fly = getKeySetting("keymap_freemove");
        key_fast = getKeySetting("keymap_fastmove");
@@ -407,6 +439,9 @@ bool GUIKeyChangeMenu::resetMenu()
                case GUI_ID_KEY_SNEAK_BUTTON:
                        this->sneak->setText(wgettext(key_sneak.name()));
                        break;
+               case GUI_ID_KEY_DROP_BUTTON:
+                       this->dropbtn->setText(wgettext(key_drop.name()));
+                       break;
                case GUI_ID_KEY_INVENTORY_BUTTON:
                        this->inventory->setText(
                                        wgettext(key_inventory.name()));
@@ -417,6 +452,9 @@ bool GUIKeyChangeMenu::resetMenu()
                case GUI_ID_KEY_CMD_BUTTON:
                        this->cmd->setText(wgettext(key_cmd.name()));
                        break;
+               case GUI_ID_KEY_CONSOLE_BUTTON:
+                       this->console->setText(wgettext(key_console.name()));
+                       break;
                case GUI_ID_KEY_RANGE_BUTTON:
                        this->range->setText(wgettext(key_range.name()));
                        break;
@@ -476,6 +514,11 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                        this->sneak->setText(wgettext(kp.name()));
                        this->key_sneak = kp;
                }
+               else if (activeKey == GUI_ID_KEY_DROP_BUTTON)
+               {
+                       this->dropbtn->setText(wgettext(kp.name()));
+                       this->key_drop = kp;
+               }
                else if (activeKey == GUI_ID_KEY_INVENTORY_BUTTON)
                {
                        this->inventory->setText(wgettext(kp.name()));
@@ -491,6 +534,11 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                        this->cmd->setText(wgettext(kp.name()));
                        this->key_cmd = kp;
                }
+               else if (activeKey == GUI_ID_KEY_CONSOLE_BUTTON)
+               {
+                       this->console->setText(wgettext(kp.name()));
+                       this->key_console = kp;
+               }
                else if (activeKey == GUI_ID_KEY_RANGE_BUTTON)
                {
                        this->range->setText(wgettext(kp.name()));
@@ -590,6 +638,11 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                                activeKey = event.GUIEvent.Caller->getID();
                                this->jump->setText(wgettext("press Key"));
                                break;
+                       case GUI_ID_KEY_DROP_BUTTON:
+                               resetMenu();
+                               activeKey = event.GUIEvent.Caller->getID();
+                               this->dropbtn->setText(wgettext("press Key"));
+                               break;
                        case GUI_ID_KEY_CHAT_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();
@@ -600,6 +653,11 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
                                activeKey = event.GUIEvent.Caller->getID();
                                this->cmd->setText(wgettext("press Key"));
                                break;
+                       case GUI_ID_KEY_CONSOLE_BUTTON:
+                               resetMenu();
+                               activeKey = event.GUIEvent.Caller->getID();
+                               this->console->setText(wgettext("press Key"));
+                               break;
                        case GUI_ID_KEY_SNEAK_BUTTON:
                                resetMenu();
                                activeKey = event.GUIEvent.Caller->getID();