X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiKeyChangeMenu.cpp;h=6e41677ce33b21d234ca1c441cc459374769d9ff;hb=1d1aec9631e3ae077db6060f0fe19487b7b23aae;hp=4a11cf93c0ee3a16e28ffadfe6bf55b9c639185b;hpb=112b85d0fb97b896da977a3915dab73015681896;p=dragonfireclient.git

diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index 4a11cf93c..6e41677ce 100644
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -1,5 +1,5 @@
 /*
- Minetest-delta
+ Minetest-c55
  Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com>
  Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
  Copyright (C) 2011 teddydestodes <derkomtur@schattengang.net>
@@ -80,9 +80,9 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 125, 20);
 		rect += topleft + v2s32(25, 3);
-		const wchar_t *text = L"KEYBINDINGS";
 		//gui::IGUIStaticText *t =
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("KEYBINDINGS"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 	v2s32 offset(25, 40);
@@ -91,8 +91,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Forward";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Forward"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -108,8 +108,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Backward";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Backward"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -124,8 +124,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Left";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Left"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -139,8 +139,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Right";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Right"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -155,8 +155,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Use";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Use"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -170,8 +170,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Sneak";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Sneak"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -186,8 +186,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Jump";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Jump"), rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -202,8 +201,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Inventory";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Inventory"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -218,8 +217,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Chat";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Chat"), rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -235,8 +233,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Toggle fly";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Toggle fly"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -250,8 +248,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Toggle fast";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Toggle fast"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -265,8 +263,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Range select";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Range select"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -282,8 +280,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 20);
 		rect += topleft + v2s32(offset.X, offset.Y);
-		const wchar_t *text = L"Print stacks";
-		Environment->addStaticText(text, rect, false, true, this, -1);
+		Environment->addStaticText(wgettext("Print stacks"),
+				rect, false, true, this, -1);
 		//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
 	}
 
@@ -296,12 +294,14 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
 	{
 		core::rect < s32 > rect(0, 0, 100, 30);
 		rect += topleft + v2s32(size.X - 100 - 20, size.Y - 40);
-		Environment->addButton(rect, this, GUI_ID_BACK_BUTTON, L"Save");
+		Environment->addButton(rect, this, GUI_ID_BACK_BUTTON,
+		wgettext("Save"));
 	}
 	{
 		core::rect < s32 > rect(0, 0, 100, 30);
 		rect += topleft + v2s32(size.X - 100 - 20 - 100 - 20, size.Y - 40);
-		Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON, L"Cancel");
+		Environment->addButton(rect, this, GUI_ID_ABORT_BUTTON,
+		wgettext("Cancel"));
 	}
 }
 
@@ -526,67 +526,67 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
 			case GUI_ID_KEY_FORWARD_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->forward->setText(L"press Key");
+				this->forward->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_BACKWARD_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->backward->setText(L"press Key");
+				this->backward->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_LEFT_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->left->setText(L"press Key");
+				this->left->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_RIGHT_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->right->setText(L"press Key");
+				this->right->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_USE_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->use->setText(L"press Key");
+				this->use->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_FLY_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->fly->setText(L"press Key");
+				this->fly->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_FAST_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->fast->setText(L"press Key");
+				this->fast->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_JUMP_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->jump->setText(L"press Key");
+				this->jump->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_CHAT_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->chat->setText(L"press Key");
+				this->chat->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_SNEAK_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->sneak->setText(L"press Key");
+				this->sneak->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_INVENTORY_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->inventory->setText(L"press Key");
+				this->inventory->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_DUMP_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->dump->setText(L"press Key");
+				this->dump->setText(wgettext("press Key"));
 				break;
 			case GUI_ID_KEY_RANGE_BUTTON:
 				resetMenu();
 				activeKey = event.GUIEvent.Caller->getID();
-				this->range->setText(L"press Key");
+				this->range->setText(wgettext("press Key"));
 				break;
 			}
 			//Buttons