Bring po update out of cmake again

[dragonfireclient.git] / src / guiTextInputMenu.cpp

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index 8a9da3489b1f67a196f8d08215bc1a5347dd76aa..252e452f5d30f690c86c24abd2340b51c506c613 100644 (file)
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -22,13 +22,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 #include <string>
 
+#include "gettext.h"
+
 GUITextInputMenu::GUITextInputMenu(gui::IGUIEnvironment* env,
                gui::IGUIElement* parent, s32 id,
-               int *active_menu_count,
+               IMenuManager *menumgr,
                TextDest *dest,
                std::wstring initial_text
 ):
-       GUIModalMenu(env, parent, id, active_menu_count),
+       GUIModalMenu(env, parent, id, menumgr),
        m_dest(dest),
        m_initial_text(initial_text)
 {
@@ -37,6 +39,8 @@ GUITextInputMenu::GUITextInputMenu(gui::IGUIEnvironment* env,
 GUITextInputMenu::~GUITextInputMenu()
 {
        removeChildren();
+       if(m_dest)
+               delete m_dest;
 }
 
 void GUITextInputMenu::removeChildren()
@@ -103,7 +107,8 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
-               Environment->addButton(rect, this, 257, L"Proceed");
+               Environment->addButton(rect, this, 257,
+                       chartowchar_t(gettext("Proceed")));
        }
 }
 
@@ -120,6 +125,20 @@ void GUITextInputMenu::drawMenu()
        gui::IGUIElement::draw();
 }
 
+void GUITextInputMenu::acceptInput()
+{
+       if(m_dest)
+       {
+               gui::IGUIElement *e = getElementFromId(256);
+               if(e != NULL)
+               {
+                       m_dest->gotText(e->getText());
+               }
+               delete m_dest;
+               m_dest = NULL;
+       }
+}
+
 bool GUITextInputMenu::OnEvent(const SEvent& event)
 {
        if(event.EventType==EET_KEY_INPUT_EVENT)
@@ -129,6 +148,12 @@ bool GUITextInputMenu::OnEvent(const SEvent& event)
                        quitMenu();
                        return true;
                }
+               if(event.KeyInput.Key==KEY_RETURN && event.KeyInput.PressedDown)
+               {
+                       acceptInput();
+                       quitMenu();
+                       return true;
+               }
        }
        if(event.EventType==EET_GUI_EVENT)
        {
@@ -148,17 +173,21 @@ bool GUITextInputMenu::OnEvent(const SEvent& event)
                        switch(event.GUIEvent.Caller->getID())
                        {
                        case 257:
-                               if(m_dest)
-                               {
-                                       gui::IGUIElement *e = getElementFromId(256);
-                                       if(e != NULL)
-                                       {
-                                               m_dest->gotText(e->getText());
-                                       }
-                                       delete m_dest;
-                               }
+                               acceptInput();
                                quitMenu();
-                               break;
+                               // quitMenu deallocates menu
+                               return true;
+                       }
+               }
+               if(event.GUIEvent.EventType==gui::EGET_EDITBOX_ENTER)
+               {
+                       switch(event.GUIEvent.Caller->getID())
+                       {
+                       case 256:
+                               acceptInput();
+                               quitMenu();
+                               // quitMenu deallocates menu
+                               return true;
                        }
                }
        }