ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove translation from joystick keys 

Avoid issues with translation, at least for now,
by not translating joystick button/axis names.
This commit is contained in:
Edênis Freindorfer Azevedo 2019-07-04 01:26:48 -03:00 committed by Rafael Kitover
parent cec32a61cc
commit 8ea607e1c7
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/wx/widgets/joyedit.cpp
View File

@ -101,52 +101,52 @@ wxString wxJoyKeyTextCtrl::ToString(int mod, int key, int joy)
wxString s; wxString s;
// Note: wx translates unconditionally (2.8.12, 2.9.1)! // Note: wx translates unconditionally (2.8.12, 2.9.1)!
// So any strings added below must also be translated unconditionally // So any strings added below must also be translated unconditionally
s.Printf(_("Joy%d-"), joy); s.Printf(("Joy%d-"), joy);
wxString mk; wxString mk;
switch (mod) { switch (mod) {
case WXJB_AXIS_PLUS: case WXJB_AXIS_PLUS:
mk.Printf(_("Axis%d+"), key); mk.Printf(("Axis%d+"), key);
break; break;
case WXJB_AXIS_MINUS: case WXJB_AXIS_MINUS:
mk.Printf(_("Axis%d-"), key); mk.Printf(("Axis%d-"), key);
break; break;
case WXJB_BUTTON: case WXJB_BUTTON:
mk.Printf(_("Button%d"), key); mk.Printf(("Button%d"), key);
break; break;
case WXJB_HAT_N: case WXJB_HAT_N:
mk.Printf(_("Hat%dN"), key); mk.Printf(("Hat%dN"), key);
break; break;
case WXJB_HAT_S: case WXJB_HAT_S:
mk.Printf(_("Hat%dS"), key); mk.Printf(("Hat%dS"), key);
break; break;
case WXJB_HAT_W: case WXJB_HAT_W:
mk.Printf(_("Hat%dW"), key); mk.Printf(("Hat%dW"), key);
break; break;
case WXJB_HAT_E: case WXJB_HAT_E:
mk.Printf(_("Hat%dE"), key); mk.Printf(("Hat%dE"), key);
break; break;
case WXJB_HAT_NW: case WXJB_HAT_NW:
mk.Printf(_("Hat%dNW"), key); mk.Printf(("Hat%dNW"), key);
break; break;
case WXJB_HAT_NE: case WXJB_HAT_NE:
mk.Printf(_("Hat%dNE"), key); mk.Printf(("Hat%dNE"), key);
break; break;
case WXJB_HAT_SW: case WXJB_HAT_SW:
mk.Printf(_("Hat%dSW"), key); mk.Printf(("Hat%dSW"), key);
break; break;
case WXJB_HAT_SE: case WXJB_HAT_SE:
mk.Printf(_("Hat%dSE"), key); mk.Printf(("Hat%dSE"), key);
break; break;
} }
@ -179,18 +179,14 @@ wxString wxJoyKeyTextCtrl::ToString(wxJoyKeyBinding_v keys, wxChar sep)
// Note: wx translates unconditionally (2.8.12, 2.9.1)! // Note: wx translates unconditionally (2.8.12, 2.9.1)!
// So any strings added below must also be translated unconditionally // So any strings added below must also be translated unconditionally
// \1 is joy # // \1 is joy #
static wxRegEx joyre(_("^Joy([0-9]+)[-+]"), wxRE_EXTENDED | wxRE_ICASE); static wxRegEx joyre;
// \1 is axis# and \2 is + or - // \1 is axis# and \2 is + or -
static wxRegEx axre(_("Axis([0-9]+)([+-])"), wxRE_EXTENDED | wxRE_ICASE); static wxRegEx axre;
// \1 is button# // \1 is button#
static wxRegEx butre(_("Button([0-9]+)"), wxRE_EXTENDED | wxRE_ICASE); static wxRegEx butre;
// \1 is hat#, \3 is N, \4 is S, \5 is E, \6 is W, \7 is NE, \8 is SE, // \1 is hat#, \3 is N, \4 is S, \5 is E, \6 is W, \7 is NE, \8 is SE,
// \9 is SW, \10 is NW // \9 is SW, \10 is NW
static wxRegEx hatre(_("Hat([0-9]+)((N|North|U|Up)|(S|South|D|Down)|" static wxRegEx hatre;
"(E|East|R|Right)|(W|West|L|Left)|"
"(NE|NorthEast|UR|UpRight)|(SE|SouthEast|DR|DownRight)|"
"(SW|SouthWest|DL|DownLeft)|(NW|NorthWest|UL|UpLeft))"),
wxRE_EXTENDED | wxRE_ICASE);
// use of static wxRegeEx is not thread-safe // use of static wxRegeEx is not thread-safe
static wxCriticalSection recs; static wxCriticalSection recs;
@ -206,6 +202,23 @@ static int simple_atoi(const wxString& s, int len)
return ret; return ret;
} }
static void CompileRegex()
{
// \1 is joy #
joyre.Compile(("^Joy([0-9]+)[-+]"), wxRE_EXTENDED | wxRE_ICASE);
// \1 is axis# and \2 is + or -
axre.Compile(("Axis([0-9]+)([+-])"), wxRE_EXTENDED | wxRE_ICASE);
// \1 is button#
butre.Compile(("Button([0-9]+)"), wxRE_EXTENDED | wxRE_ICASE);
// \1 is hat#, \3 is N, \4 is S, \5 is E, \6 is W, \7 is NE,
// \8 is SE, \9 is SW, \10 is NW
hatre.Compile(("Hat([0-9]+)((N|North|U|Up)|(S|South|D|Down)|"
"(E|East|R|Right)|(W|West|L|Left)|"
"(NE|NorthEast|UR|UpRight)|(SE|SouthEast|DR|DownRight)|"
"(SW|SouthWest|DL|DownLeft)|(NW|NorthWest|UL|UpLeft))"),
wxRE_EXTENDED | wxRE_ICASE);
}
static bool ParseJoy(const wxString& s, int len, int& mod, int& key, int& joy) static bool ParseJoy(const wxString& s, int len, int& mod, int& key, int& joy)
{ {
mod = key = joy = 0; mod = key = joy = 0;
@ -216,6 +229,7 @@ static bool ParseJoy(const wxString& s, int len, int& mod, int& key, int& joy)
wxCriticalSectionLocker lk(recs); wxCriticalSectionLocker lk(recs);
size_t b, l; size_t b, l;
CompileRegex();
if (!joyre.Matches(s) || !joyre.GetMatch(&b, &l) || b) if (!joyre.Matches(s) || !joyre.GetMatch(&b, &l) || b)
return false; return false;