Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add cancel button to password change menu. (#5720)

Browse Source 
* Add cancel button to password change menu.
This commit is contained in:
red-001 2017-05-09 10:04:45 +01:00 committed by Loïc Blot
parent a32a06e088
commit 8729e7daec
1 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/guiPasswordChange.cpp
View File

@ -33,6 +33,7 @@ const int ID_newPassword1 = 257;
const int ID_newPassword2 = 258;
const int ID_change = 259;
const int ID_message = 260;
const int ID_cancel = 261;
GUIPasswordChange::GUIPasswordChange(gui::IGUIEnvironment* env,
gui::IGUIElement* parent, s32 id,
@ -71,6 +72,11 @@ void GUIPasswordChange::removeChildren()
if (e != NULL)
e->remove();
}
{
gui::IGUIElement *e = getElementFromId(ID_cancel);
if (e != NULL)
e->remove();
}
}
void GUIPasswordChange::regenerateGui(v2u32 screensize)
@ -112,8 +118,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos);
gui::IGUIEditBox *e =
Environment->addEditBox(L"", rect, true, this, ID_oldPassword);
gui::IGUIEditBox *e = Environment->addEditBox(
L"", rect, true, this, ID_oldPassword);
Environment->setFocus(e);
e->setPasswordBox(true);
}
@ -128,8 +134,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos);
gui::IGUIEditBox *e =
Environment->addEditBox(L"", rect, true, this, ID_newPassword1);
gui::IGUIEditBox *e = Environment->addEditBox(
L"", rect, true, this, ID_newPassword1);
e->setPasswordBox(true);
}
ypos += 50;
@ -143,19 +149,26 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos);
gui::IGUIEditBox *e =
Environment->addEditBox(L"", rect, true, this, ID_newPassword2);
gui::IGUIEditBox *e = Environment->addEditBox(
L"", rect, true, this, ID_newPassword2);
e->setPasswordBox(true);
}
ypos += 50;
{
core::rect<s32> rect(0, 0, 140, 30);
rect = rect + v2s32(size.X/2-140/2, ypos);
core::rect<s32> rect(0, 0, 100, 30);
rect = rect + v2s32(size.X / 4 + 56, ypos);
text = wgettext("Change");
Environment->addButton(rect, this, ID_change, text);
delete[] text;
}
{
core::rect<s32> rect(0, 0, 100, 30);
rect = rect + v2s32(size.X / 4 + 185, ypos);
text = wgettext("Cancel");
Environment->addButton(rect, this, ID_cancel, text);
delete[] text;
}
ypos += 50;
{
@ -164,8 +177,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
text = wgettext("Passwords do not match!");
IGUIElement *e =
Environment->addStaticText(
text,
rect, false, true, this, ID_message);
text, rect, false, true, this, ID_message);
e->setVisible(false);
delete[] text;
}
@ -196,61 +208,52 @@ bool GUIPasswordChange::acceptInput()
if (e != NULL)
newpass = e->getText();
e = getElementFromId(ID_newPassword2);
if(e != NULL && newpass != e->getText())
{
if (e != NULL && newpass != e->getText()) {
e = getElementFromId(ID_message);
if (e != NULL)
e->setVisible(true);
return false;
}
m_client->sendChangePassword(wide_to_utf8(oldpass),
wide_to_utf8(newpass));
m_client->sendChangePassword(wide_to_utf8(oldpass), wide_to_utf8(newpass));
return true;
}
bool GUIPasswordChange::OnEvent(const SEvent &event)
{
if(event.EventType==EET_KEY_INPUT_EVENT)
{
if(event.KeyInput.Key==KEY_ESCAPE && event.KeyInput.PressedDown)
{
if (event.EventType == EET_KEY_INPUT_EVENT) {
if (event.KeyInput.Key == KEY_ESCAPE && event.KeyInput.PressedDown) {
quitMenu();
return true;
}
if(event.KeyInput.Key==KEY_RETURN && event.KeyInput.PressedDown)
{
if (event.KeyInput.Key == KEY_RETURN && event.KeyInput.PressedDown) {
if (acceptInput())
quitMenu();
return true;
}
}
if(event.EventType==EET_GUI_EVENT)
{
if(event.GUIEvent.EventType==gui::EGET_ELEMENT_FOCUS_LOST
&& isVisible())
{
if(!canTakeFocus(event.GUIEvent.Element))
{
if (event.EventType == EET_GUI_EVENT) {
if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST &&
isVisible()) {
if (!canTakeFocus(event.GUIEvent.Element)) {
dstream << "GUIPasswordChange: Not allowing focus change."
<< std::endl;
// Returning true disables focus change
return true;
}
}
if(event.GUIEvent.EventType==gui::EGET_BUTTON_CLICKED)
{
switch(event.GUIEvent.Caller->getID())
{
if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) {
switch (event.GUIEvent.Caller->getID()) {
case ID_change:
if (acceptInput())
quitMenu();
return true;
case ID_cancel:
quitMenu();
return true;
}
}
if(event.GUIEvent.EventType==gui::EGET_EDITBOX_ENTER)
{
switch(event.GUIEvent.Caller->getID())
{
if (event.GUIEvent.EventType == gui::EGET_EDITBOX_ENTER) {
switch (event.GUIEvent.Caller->getID()) {
case ID_oldPassword:
case ID_newPassword1:
case ID_newPassword2:
@ -263,4 +266,3 @@ bool GUIPasswordChange::OnEvent(const SEvent& event)
return Parent ? Parent->OnEvent(event) : false;
}