projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ObjectRef:punch and ObjectRef:right_click to Lua API
[oweals/minetest.git]
/
src
/
guiPasswordChange.cpp
diff --git
a/src/guiPasswordChange.cpp
b/src/guiPasswordChange.cpp
index fabe7511013d8ccd56394c1626859793b4a19d3e..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,12
+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")
),
+ Environment->addStaticText(
wgettext("Old Password"
),
rect, false, true, this, -1);
}
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);
@@
-111,12
+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")
),
+ Environment->addStaticText(
wgettext("New Password"
),
rect, false, true, this, -1);
}
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);
@@
-125,12
+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")
),
+ Environment->addStaticText(
wgettext("Confirm Password"
),
rect, false, true, this, -1);
}
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);
@@
-140,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;
@@
-152,10
+164,11
@@
void GUIPasswordChange::regenerateGui(v2u32 screensize)
rect += topleft_client + v2s32(35, ypos);
IGUIElement *e =
Environment->addStaticText(
rect += topleft_client + v2s32(35, ypos);
IGUIElement *e =
Environment->addStaticText(
-
chartowchar_t(gettext("Passwords do not match!")
),
+
wgettext("Passwords do not match!"
),
rect, false, true, this, ID_message);
e->setVisible(false);
}
rect, false, true, this, ID_message);
e->setVisible(false);
}
+ changeCtype("C");
}
}