BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 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

112
src/guiPasswordChange.cpp
View File

@ -33,6 +33,7 @@ const int ID_newPassword1 = 257;
const int ID_newPassword2 = 258; const int ID_newPassword2 = 258;
const int ID_change = 259; const int ID_change = 259;
const int ID_message = 260; const int ID_message = 260;
const int ID_cancel = 261;
GUIPasswordChange::GUIPasswordChange(gui::IGUIEnvironment* env, GUIPasswordChange::GUIPasswordChange(gui::IGUIEnvironment* env,
gui::IGUIElement* parent, s32 id, gui::IGUIElement* parent, s32 id,
@ -53,22 +54,27 @@ void GUIPasswordChange::removeChildren()
{ {
{ {
gui::IGUIElement *e = getElementFromId(ID_oldPassword); gui::IGUIElement *e = getElementFromId(ID_oldPassword);
if(e != NULL) if (e != NULL)
e->remove(); e->remove();
} }
{ {
gui::IGUIElement *e = getElementFromId(ID_newPassword1); gui::IGUIElement *e = getElementFromId(ID_newPassword1);
if(e != NULL) if (e != NULL)
e->remove(); e->remove();
} }
{ {
gui::IGUIElement *e = getElementFromId(ID_newPassword2); gui::IGUIElement *e = getElementFromId(ID_newPassword2);
if(e != NULL) if (e != NULL)
e->remove(); e->remove();
} }
{ {
gui::IGUIElement *e = getElementFromId(ID_change); gui::IGUIElement *e = getElementFromId(ID_change);
if(e != NULL) if (e != NULL)
e->remove();
}
{
gui::IGUIElement *e = getElementFromId(ID_cancel);
if (e != NULL)
e->remove(); e->remove();
} }
} }
@ -104,7 +110,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
s32 ypos = 50; s32 ypos = 50;
{ {
core::rect<s32> rect(0, 0, 150, 20); core::rect<s32> rect(0, 0, 150, 20);
rect += topleft_client + v2s32(25, ypos+6); rect += topleft_client + v2s32(25, ypos + 6);
text = wgettext("Old Password"); text = wgettext("Old Password");
Environment->addStaticText(text, rect, false, true, this, -1); Environment->addStaticText(text, rect, false, true, this, -1);
delete[] text; delete[] text;
@ -112,15 +118,15 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{ {
core::rect<s32> rect(0, 0, 230, 30); core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos); rect += topleft_client + v2s32(160, ypos);
gui::IGUIEditBox *e = gui::IGUIEditBox *e = Environment->addEditBox(
Environment->addEditBox(L"", rect, true, this, ID_oldPassword); L"", rect, true, this, ID_oldPassword);
Environment->setFocus(e); Environment->setFocus(e);
e->setPasswordBox(true); e->setPasswordBox(true);
} }
ypos += 50; ypos += 50;
{ {
core::rect<s32> rect(0, 0, 150, 20); core::rect<s32> rect(0, 0, 150, 20);
rect += topleft_client + v2s32(25, ypos+6); rect += topleft_client + v2s32(25, ypos + 6);
text = wgettext("New Password"); text = wgettext("New Password");
Environment->addStaticText(text, rect, false, true, this, -1); Environment->addStaticText(text, rect, false, true, this, -1);
delete[] text; delete[] text;
@ -128,14 +134,14 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{ {
core::rect<s32> rect(0, 0, 230, 30); core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos); rect += topleft_client + v2s32(160, ypos);
gui::IGUIEditBox *e = gui::IGUIEditBox *e = Environment->addEditBox(
Environment->addEditBox(L"", rect, true, this, ID_newPassword1); L"", rect, true, this, ID_newPassword1);
e->setPasswordBox(true); e->setPasswordBox(true);
} }
ypos += 50; ypos += 50;
{ {
core::rect<s32> rect(0, 0, 150, 20); core::rect<s32> rect(0, 0, 150, 20);
rect += topleft_client + v2s32(25, ypos+6); rect += topleft_client + v2s32(25, ypos + 6);
text = wgettext("Confirm Password"); text = wgettext("Confirm Password");
Environment->addStaticText(text, rect, false, true, this, -1); Environment->addStaticText(text, rect, false, true, this, -1);
delete[] text; delete[] text;
@ -143,19 +149,26 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{ {
core::rect<s32> rect(0, 0, 230, 30); core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos); rect += topleft_client + v2s32(160, ypos);
gui::IGUIEditBox *e = gui::IGUIEditBox *e = Environment->addEditBox(
Environment->addEditBox(L"", rect, true, this, ID_newPassword2); L"", rect, true, this, ID_newPassword2);
e->setPasswordBox(true); e->setPasswordBox(true);
} }
ypos += 50; ypos += 50;
{ {
core::rect<s32> rect(0, 0, 140, 30); core::rect<s32> rect(0, 0, 100, 30);
rect = rect + v2s32(size.X/2-140/2, ypos); rect = rect + v2s32(size.X / 4 + 56, ypos);
text = wgettext("Change"); text = wgettext("Change");
Environment->addButton(rect, this, ID_change, text); Environment->addButton(rect, this, ID_change, text);
delete[] 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; ypos += 50;
{ {
@ -164,8 +177,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
text = wgettext("Passwords do not match!"); text = wgettext("Passwords do not match!");
IGUIElement *e = IGUIElement *e =
Environment->addStaticText( Environment->addStaticText(
text, text, rect, false, true, this, ID_message);
rect, false, true, this, ID_message);
e->setVisible(false); e->setVisible(false);
delete[] text; delete[] text;
} }
@ -173,12 +185,12 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
void GUIPasswordChange::drawMenu() void GUIPasswordChange::drawMenu()
{ {
gui::IGUISkin* skin = Environment->getSkin(); gui::IGUISkin *skin = Environment->getSkin();
if (!skin) if (!skin)
return; return;
video::IVideoDriver* driver = Environment->getVideoDriver(); video::IVideoDriver *driver = Environment->getVideoDriver();
video::SColor bgcolor(140,0,0,0); video::SColor bgcolor(140, 0, 0, 0);
driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect); driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect);
gui::IGUIElement::draw(); gui::IGUIElement::draw();
@ -190,71 +202,62 @@ bool GUIPasswordChange::acceptInput()
std::wstring newpass; std::wstring newpass;
gui::IGUIElement *e; gui::IGUIElement *e;
e = getElementFromId(ID_oldPassword); e = getElementFromId(ID_oldPassword);
if(e != NULL) if (e != NULL)
oldpass = e->getText(); oldpass = e->getText();
e = getElementFromId(ID_newPassword1); e = getElementFromId(ID_newPassword1);
if(e != NULL) if (e != NULL)
newpass = e->getText(); newpass = e->getText();
e = getElementFromId(ID_newPassword2); e = getElementFromId(ID_newPassword2);
if(e != NULL && newpass != e->getText()) if (e != NULL && newpass != e->getText()) {
{
e = getElementFromId(ID_message); e = getElementFromId(ID_message);
if(e != NULL) if (e != NULL)
e->setVisible(true); e->setVisible(true);
return false; return false;
} }
m_client->sendChangePassword(wide_to_utf8(oldpass), m_client->sendChangePassword(wide_to_utf8(oldpass), wide_to_utf8(newpass));
wide_to_utf8(newpass));
return true; return true;
} }
bool GUIPasswordChange::OnEvent(const SEvent& event) bool GUIPasswordChange::OnEvent(const SEvent &event)
{ {
if(event.EventType==EET_KEY_INPUT_EVENT) if (event.EventType == EET_KEY_INPUT_EVENT) {
{ if (event.KeyInput.Key == KEY_ESCAPE && event.KeyInput.PressedDown) {
if(event.KeyInput.Key==KEY_ESCAPE && event.KeyInput.PressedDown)
{
quitMenu(); quitMenu();
return true; return true;
} }
if(event.KeyInput.Key==KEY_RETURN && event.KeyInput.PressedDown) if (event.KeyInput.Key == KEY_RETURN && event.KeyInput.PressedDown) {
{ if (acceptInput())
if(acceptInput())
quitMenu(); quitMenu();
return true; return true;
} }
} }
if(event.EventType==EET_GUI_EVENT) if (event.EventType == EET_GUI_EVENT) {
{ if (event.GUIEvent.EventType == gui::EGET_ELEMENT_FOCUS_LOST &&
if(event.GUIEvent.EventType==gui::EGET_ELEMENT_FOCUS_LOST isVisible()) {
&& isVisible()) if (!canTakeFocus(event.GUIEvent.Element)) {
{ dstream << "GUIPasswordChange: Not allowing focus change."
if(!canTakeFocus(event.GUIEvent.Element)) << std::endl;
{
dstream<<"GUIPasswordChange: Not allowing focus change."
<<std::endl;
// Returning true disables focus change // Returning true disables focus change
return true; return true;
} }
} }
if(event.GUIEvent.EventType==gui::EGET_BUTTON_CLICKED) if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) {
{ switch (event.GUIEvent.Caller->getID()) {
switch(event.GUIEvent.Caller->getID())
{
case ID_change: case ID_change:
if(acceptInput()) if (acceptInput())
quitMenu();
return true;
case ID_cancel:
quitMenu(); quitMenu();
return true; return true;
} }
} }
if(event.GUIEvent.EventType==gui::EGET_EDITBOX_ENTER) if (event.GUIEvent.EventType == gui::EGET_EDITBOX_ENTER) {
{ switch (event.GUIEvent.Caller->getID()) {
switch(event.GUIEvent.Caller->getID())
{
case ID_oldPassword: case ID_oldPassword:
case ID_newPassword1: case ID_newPassword1:
case ID_newPassword2: case ID_newPassword2:
if(acceptInput()) if (acceptInput())
quitMenu(); quitMenu();
return true; return true;
} }
@ -263,4 +266,3 @@ bool GUIPasswordChange::OnEvent(const SEvent& event)
return Parent ? Parent->OnEvent(event) : false; return Parent ? Parent->OnEvent(event) : false;
} }