summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/guiKeyChangeMenu.cpp78
-rw-r--r--src/guiKeyChangeMenu.h34
2 files changed, 56 insertions, 56 deletions
diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index cdf32d176..20a3d361e 100644
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -101,7 +101,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->forward = Environment->addButton(rect, this,
GUI_ID_KEY_FORWARD_BUTTON,
- narrow_to_wide(KeyNames[key_forward]).c_str());
+ wgettext(KeyNames[key_forward]));
}
offset += v2s32(0, 25);
@@ -118,7 +118,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->backward = Environment->addButton(rect, this,
GUI_ID_KEY_BACKWARD_BUTTON,
- narrow_to_wide(KeyNames[key_backward]).c_str());
+ wgettext(KeyNames[key_backward]));
}
offset += v2s32(0, 25);
{
@@ -133,7 +133,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
core::rect < s32 > rect(0, 0, 100, 30);
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->left = Environment->addButton(rect, this, GUI_ID_KEY_LEFT_BUTTON,
- narrow_to_wide(KeyNames[key_left]).c_str());
+ wgettext(KeyNames[key_left]));
}
offset += v2s32(0, 25);
{
@@ -149,7 +149,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->right = Environment->addButton(rect, this,
GUI_ID_KEY_RIGHT_BUTTON,
- narrow_to_wide(KeyNames[key_right]).c_str());
+ wgettext(KeyNames[key_right]));
}
offset += v2s32(0, 25);
{
@@ -164,7 +164,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
core::rect < s32 > rect(0, 0, 100, 30);
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->use = Environment->addButton(rect, this, GUI_ID_KEY_USE_BUTTON,
- narrow_to_wide(KeyNames[key_use]).c_str());
+ wgettext(KeyNames[key_use]));
}
offset += v2s32(0, 25);
{
@@ -180,7 +180,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->sneak = Environment->addButton(rect, this,
GUI_ID_KEY_SNEAK_BUTTON,
- narrow_to_wide(KeyNames[key_sneak]).c_str());
+ wgettext(KeyNames[key_sneak]));
}
offset += v2s32(0, 25);
{
@@ -194,7 +194,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
core::rect < s32 > rect(0, 0, 100, 30);
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->jump = Environment->addButton(rect, this, GUI_ID_KEY_JUMP_BUTTON,
- narrow_to_wide(KeyNames[key_jump]).c_str());
+ wgettext(KeyNames[key_jump]));
}
offset += v2s32(0, 25);
@@ -211,7 +211,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->inventory = Environment->addButton(rect, this,
GUI_ID_KEY_INVENTORY_BUTTON,
- narrow_to_wide(KeyNames[key_inventory]).c_str());
+ wgettext(KeyNames[key_inventory]));
}
offset += v2s32(0, 25);
{
@@ -225,7 +225,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
core::rect < s32 > rect(0, 0, 100, 30);
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->chat = Environment->addButton(rect, this, GUI_ID_KEY_CHAT_BUTTON,
- narrow_to_wide(KeyNames[key_chat]).c_str());
+ wgettext(KeyNames[key_chat]));
}
//next col
@@ -242,7 +242,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
core::rect < s32 > rect(0, 0, 100, 30);
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->fly = Environment->addButton(rect, this, GUI_ID_KEY_FLY_BUTTON,
- narrow_to_wide(KeyNames[key_fly]).c_str());
+ wgettext(KeyNames[key_fly]));
}
offset += v2s32(0, 25);
{
@@ -257,7 +257,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
core::rect < s32 > rect(0, 0, 100, 30);
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->fast = Environment->addButton(rect, this, GUI_ID_KEY_FAST_BUTTON,
- narrow_to_wide(KeyNames[key_fast]).c_str());
+ wgettext(KeyNames[key_fast]));
}
offset += v2s32(0, 25);
{
@@ -273,7 +273,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->range = Environment->addButton(rect, this,
GUI_ID_KEY_RANGE_BUTTON,
- narrow_to_wide(KeyNames[key_range]).c_str());
+ wgettext(KeyNames[key_range]));
}
offset += v2s32(0, 25);
@@ -289,7 +289,7 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
core::rect < s32 > rect(0, 0, 100, 30);
rect += topleft + v2s32(offset.X + 105, offset.Y - 5);
this->dump = Environment->addButton(rect, this, GUI_ID_KEY_DUMP_BUTTON,
- narrow_to_wide(KeyNames[key_dump]).c_str());
+ wgettext(KeyNames[key_dump]));
}
{
core::rect < s32 > rect(0, 0, 100, 30);
@@ -367,45 +367,45 @@ bool GUIKeyChangeMenu::resetMenu()
{
case GUI_ID_KEY_FORWARD_BUTTON:
this->forward->setText(
- narrow_to_wide(KeyNames[key_forward]).c_str());
+ wgettext(KeyNames[key_forward]));
break;
case GUI_ID_KEY_BACKWARD_BUTTON:
this->backward->setText(
- narrow_to_wide(KeyNames[key_backward]).c_str());
+ wgettext(KeyNames[key_backward]));
break;
case GUI_ID_KEY_LEFT_BUTTON:
- this->left->setText(narrow_to_wide(KeyNames[key_left]).c_str());
+ this->left->setText(wgettext(KeyNames[key_left]));
break;
case GUI_ID_KEY_RIGHT_BUTTON:
- this->right->setText(narrow_to_wide(KeyNames[key_right]).c_str());
+ this->right->setText(wgettext(KeyNames[key_right]));
break;
case GUI_ID_KEY_JUMP_BUTTON:
- this->jump->setText(narrow_to_wide(KeyNames[key_jump]).c_str());
+ this->jump->setText(wgettext(KeyNames[key_jump]));
break;
case GUI_ID_KEY_SNEAK_BUTTON:
- this->sneak->setText(narrow_to_wide(KeyNames[key_sneak]).c_str());
+ this->sneak->setText(wgettext(KeyNames[key_sneak]));
break;
case GUI_ID_KEY_INVENTORY_BUTTON:
this->inventory->setText(
- narrow_to_wide(KeyNames[key_inventory]).c_str());
+ wgettext(KeyNames[key_inventory]));
break;
case GUI_ID_KEY_CHAT_BUTTON:
- this->chat->setText(narrow_to_wide(KeyNames[key_chat]).c_str());
+ this->chat->setText(wgettext(KeyNames[key_chat]));
break;
case GUI_ID_KEY_RANGE_BUTTON:
- this->range->setText(narrow_to_wide(KeyNames[key_range]).c_str());
+ this->range->setText(wgettext(KeyNames[key_range]));
break;
case GUI_ID_KEY_FLY_BUTTON:
- this->fly->setText(narrow_to_wide(KeyNames[key_fly]).c_str());
+ this->fly->setText(wgettext(KeyNames[key_fly]));
break;
case GUI_ID_KEY_FAST_BUTTON:
- this->fast->setText(narrow_to_wide(KeyNames[key_fast]).c_str());
+ this->fast->setText(wgettext(KeyNames[key_fast]));
break;
case GUI_ID_KEY_USE_BUTTON:
- this->use->setText(narrow_to_wide(KeyNames[key_use]).c_str());
+ this->use->setText(wgettext(KeyNames[key_use]));
break;
case GUI_ID_KEY_DUMP_BUTTON:
- this->dump->setText(narrow_to_wide(KeyNames[key_dump]).c_str());
+ this->dump->setText(wgettext(KeyNames[key_dump]));
break;
}
activeKey = -1;
@@ -422,79 +422,79 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
if (activeKey == GUI_ID_KEY_FORWARD_BUTTON)
{
this->forward->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_forward = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_BACKWARD_BUTTON)
{
this->backward->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_backward = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_LEFT_BUTTON)
{
this->left->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_left = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_RIGHT_BUTTON)
{
this->right->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_right = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_JUMP_BUTTON)
{
this->jump->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_jump = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_SNEAK_BUTTON)
{
this->sneak->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_sneak = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_INVENTORY_BUTTON)
{
this->inventory->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_inventory = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_CHAT_BUTTON)
{
this->chat->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_chat = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_RANGE_BUTTON)
{
this->range->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_range = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_FLY_BUTTON)
{
this->fly->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_fly = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_FAST_BUTTON)
{
this->fast->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_fast = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_USE_BUTTON)
{
this->use->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_use = event.KeyInput.Key;
}
else if (activeKey == GUI_ID_KEY_DUMP_BUTTON)
{
this->dump->setText(
- narrow_to_wide(KeyNames[event.KeyInput.Key]).c_str());
+ wgettext(KeyNames[event.KeyInput.Key]));
this->key_dump = event.KeyInput.Key;
}
changeCtype("C");
diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h
index c40d802ac..db86ab2d1 100644
--- a/src/guiKeyChangeMenu.h
+++ b/src/guiKeyChangeMenu.h
@@ -30,32 +30,32 @@
#include <string>
static const char *KeyNames[] =
- { "-", gettext("Left Button"), gettext("Right Button"), gettext("Cancel"), gettext("Middle Button"), gettext("X Button 1"),
- gettext("X Button 2"), "-", gettext("Back"), gettext("Tab"), "-", "-", gettext("Clear"), gettext("Return"), "-",
- "-", gettext("Shift"), gettext("Control"), gettext("Menu"), gettext("Pause"), gettext("Capital"), gettext("Kana"), "-",
- gettext("Junja"), gettext("Final"), gettext("Kanji"), "-", gettext("Escape"), gettext("Convert"), gettext("Nonconvert"),
- gettext("Accept"), gettext("Mode Change"), gettext("Space"), gettext("Priot"), gettext("Next"), gettext("End"), gettext("Home"),
- gettext("Left"), gettext("Up"), gettext("Right"), gettext("Down"), gettext("Select"), gettext("Print"), gettext("Execute"),
- gettext("Snapshot"), gettext("Insert"), gettext("Delete"), gettext("Help"), "0", "1", "2", "3", "4", "5",
+ { "-", N_("Left Button"), N_("Right Button"), N_("Cancel"), N_("Middle Button"), N_("X Button 1"),
+ N_("X Button 2"), "-", N_("Back"), N_("Tab"), "-", "-", N_("Clear"), N_("Return"), "-",
+ "-", N_("Shift"), N_("Control"), N_("Menu"), N_("Pause"), N_("Capital"), N_("Kana"), "-",
+ N_("Junja"), N_("Final"), N_("Kanji"), "-", N_("Escape"), N_("Convert"), N_("Nonconvert"),
+ N_("Accept"), N_("Mode Change"), N_("Space"), N_("Priot"), N_("Next"), N_("End"), N_("Home"),
+ N_("Left"), N_("Up"), N_("Right"), N_("Down"), N_("Select"), N_("Print"), N_("Execute"),
+ N_("Snapshot"), N_("Insert"), N_("Delete"), N_("Help"), "0", "1", "2", "3", "4", "5",
"6", "7", "8", "9", "-", "-", "-", "-", "-", "-", "-", "A", "B", "C",
"D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q",
- "R", "S", "T", "U", "V", "W", "X", "Y", "Z", gettext("Left Windows"),
- gettext("Right Windows"), gettext("Apps"), "-", gettext("Sleep"), gettext("Numpad 0"), gettext("Numpad 1"),
- gettext("Numpad 2"), gettext("Numpad 3"), gettext("Numpad 4"), gettext("Numpad 5"), gettext("Numpad 6"), gettext("Numpad 7"),
- gettext("Numpad 8"), gettext("Numpad 9"), gettext("Numpad *"), gettext("Numpad +"), gettext("Numpad /"), gettext("Numpad -"),
+ "R", "S", "T", "U", "V", "W", "X", "Y", "Z", N_("Left Windows"),
+ N_("Right Windows"), N_("Apps"), "-", N_("Sleep"), N_("Numpad 0"), N_("Numpad 1"),
+ N_("Numpad 2"), N_("Numpad 3"), N_("Numpad 4"), N_("Numpad 5"), N_("Numpad 6"), N_("Numpad 7"),
+ N_("Numpad 8"), N_("Numpad 9"), N_("Numpad *"), N_("Numpad +"), N_("Numpad /"), N_("Numpad -"),
"Numpad .", "Numpad /", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8",
"F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18",
"F19", "F20", "F21", "F22", "F23", "F24", "-", "-", "-", "-", "-", "-",
- "-", "-", gettext("Num Lock"), gettext("Scroll Lock"), "-", "-", "-", "-", "-", "-", "-",
- "-", "-", "-", "-", "-", "-", "-", gettext("Left Shift"), gettext("Right Shight"),
- gettext("Left Control"), gettext("Right Control"), gettext("Left Menu"), gettext("Right Menu"), "-", "-",
+ "-", "-", N_("Num Lock"), N_("Scroll Lock"), "-", "-", "-", "-", "-", "-", "-",
+ "-", "-", "-", "-", "-", "-", "-", N_("Left Shift"), N_("Right Shight"),
+ N_("Left Control"), N_("Right Control"), N_("Left Menu"), N_("Right Menu"), "-", "-",
"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
- "-", "-", "-", "-", "-", gettext("Plus"), gettext("Comma"), gettext("Minus"), gettext("Period"), "-", "-",
+ "-", "-", "-", "-", "-", N_("Plus"), N_("Comma"), N_("Minus"), N_("Period"), "-", "-",
"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
- "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", gettext("Attn"), gettext("CrSel"),
- gettext("ExSel"), gettext("Erase OEF"), gettext("Play"), gettext("Zoom"), gettext("PA1"), gettext("OEM Clear"), "-" };
+ "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", N_("Attn"), N_("CrSel"),
+ N_("ExSel"), N_("Erase OEF"), N_("Play"), N_("Zoom"), N_("PA1"), N_("OEM Clear"), "-" };
enum
{
GUI_ID_BACK_BUTTON = 101, GUI_ID_ABORT_BUTTON, GUI_ID_SCROLL_BAR,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 08:53:35 +0000