projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master'
[oweals/minetest.git]
/
src
/
guiPasswordChange.cpp
diff --git
a/src/guiPasswordChange.cpp
b/src/guiPasswordChange.cpp
index 79601a99fb5724cd60f238f7c12c7f34b366b65e..ecae55e108c085c54b7a643c9bcbf7d4f01b90ff 100644
(file)
--- a/
src/guiPasswordChange.cpp
+++ b/
src/guiPasswordChange.cpp
@@
-20,6
+20,11
@@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "debug.h"
#include "serialization.h"
#include <string>
#include "debug.h"
#include "serialization.h"
#include <string>
+#include <IGUICheckBox.h>
+#include <IGUIEditBox.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIFont.h>
#include "gettext.h"
#include "gettext.h"
@@
-96,11
+101,14
@@
void GUIPasswordChange::regenerateGui(v2u32 screensize)
Add stuff
*/
s32 ypos = 50;
Add stuff
*/
s32 ypos = 50;
+ changeCtype("");
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
- Environment->addStaticText(chartowchar_t(gettext("Old Password")), rect, false, true, this, -1);
+ Environment->addStaticText(wgettext("Old Password"),
+ rect, false, true, this, -1);
}
}
+ changeCtype("C");
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos);
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos);
@@
-110,11
+118,14
@@
void GUIPasswordChange::regenerateGui(v2u32 screensize)
e->setPasswordBox(true);
}
ypos += 50;
e->setPasswordBox(true);
}
ypos += 50;
+ changeCtype("");
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
- Environment->addStaticText(chartowchar_t(gettext("New Password")), rect, false, true, this, -1);
+ Environment->addStaticText(wgettext("New Password"),
+ rect, false, true, this, -1);
}
}
+ changeCtype("C");
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos);
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos);
@@
-123,11
+134,14
@@
void GUIPasswordChange::regenerateGui(v2u32 screensize)
e->setPasswordBox(true);
}
ypos += 50;
e->setPasswordBox(true);
}
ypos += 50;
+ changeCtype("");
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
- Environment->addStaticText(chartowchar_t(gettext("Confirm Password")), rect, false, true, this, -1);
+ Environment->addStaticText(wgettext("Confirm Password"),
+ rect, false, true, this, -1);
}
}
+ changeCtype("C");
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos);
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, ypos);
@@
-137,10
+151,11
@@
void GUIPasswordChange::regenerateGui(v2u32 screensize)
}
ypos += 50;
}
ypos += 50;
+ changeCtype("");
{
core::rect<s32> rect(0, 0, 140, 30);
rect = rect + v2s32(size.X/2-140/2, ypos);
{
core::rect<s32> rect(0, 0, 140, 30);
rect = rect + v2s32(size.X/2-140/2, ypos);
- Environment->addButton(rect, this, ID_change,
chartowchar_t(gettext("Change")
));
+ Environment->addButton(rect, this, ID_change,
wgettext("Change"
));
}
ypos += 50;
}
ypos += 50;
@@
-148,9
+163,12
@@
void GUIPasswordChange::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 300, 20);
rect += topleft_client + v2s32(35, ypos);
IGUIElement *e =
core::rect<s32> rect(0, 0, 300, 20);
rect += topleft_client + v2s32(35, ypos);
IGUIElement *e =
- Environment->addStaticText(chartowchar_t(gettext("Passwords do not match!")), rect, false, true, this, ID_message);
+ Environment->addStaticText(
+ wgettext("Passwords do not match!"),
+ rect, false, true, this, ID_message);
e->setVisible(false);
}
e->setVisible(false);
}
+ changeCtype("C");
}
}