Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 07:20:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix unnecessary translation in GamePadDialog

Browse Source
This commit is contained in:
Marcin Mikołajczyk 2013-02-09 12:34:40 +01:00
parent 74348b08de
commit 635822cf47
4 changed files with 22 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Qt/gamepaddialog.cpp
View File

@ -16,26 +16,26 @@ struct GamePadInfo
// Initial values are PS3 controller
GamePadInfo GamepadPadMapping[] = {
{0, 14, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_X"), QT_TRANSLATE_NOOP("gamepadMapping", "Cross")}, //A
{0, 13, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_O"), QT_TRANSLATE_NOOP("gamepadMapping", "Circle")}, //B
{0, 15, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_S"), QT_TRANSLATE_NOOP("gamepadMapping", "Square")}, //X
{0, 12, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_T"), QT_TRANSLATE_NOOP("gamepadMapping", "Triangle")}, //Y
{0, 10, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_LT"), QT_TRANSLATE_NOOP("gamepadMapping", "Left Trigger")}, //LBUMPER
{0, 11, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_RT"), QT_TRANSLATE_NOOP("gamepadMapping", "Right Trigger")}, //RBUMPER
{0, 3, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_Start"), QT_TRANSLATE_NOOP("gamepadMapping", "Start")}, //START
{0, 0, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_Select"), QT_TRANSLATE_NOOP("gamepadMapping", "Select")}, //SELECT
{0, 4, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_Up"), QT_TRANSLATE_NOOP("gamepadMapping", "Up")}, //UP
{0, 6, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_Down"), QT_TRANSLATE_NOOP("gamepadMapping", "Down")}, //DOWN
{0, 7, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_Left"), QT_TRANSLATE_NOOP("gamepadMapping", "Left")}, //LEFT
{0, 5, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_Right"), QT_TRANSLATE_NOOP("gamepadMapping", "Right")}, //RIGHT
{0, 0, 0, QT_TRANSLATE_NOOP("gamepadMapping", "")}, //MENU (event)
{0, 16, 0, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_Home"), QT_TRANSLATE_NOOP("gamepadMapping", "Home")}, //BACK
{0, 14, 0, "Prev_X", QT_TRANSLATE_NOOP("gamepadMapping", "Cross")}, //A
{0, 13, 0, "Prev_O", QT_TRANSLATE_NOOP("gamepadMapping", "Circle")}, //B
{0, 15, 0, "Prev_S", QT_TRANSLATE_NOOP("gamepadMapping", "Square")}, //X
{0, 12, 0, "Prev_T", QT_TRANSLATE_NOOP("gamepadMapping", "Triangle")}, //Y
{0, 10, 0, "Prev_LT", QT_TRANSLATE_NOOP("gamepadMapping", "Left Trigger")}, //LBUMPER
{0, 11, 0, "Prev_RT", QT_TRANSLATE_NOOP("gamepadMapping", "Right Trigger")}, //RBUMPER
{0, 3, 0, "Prev_Start", QT_TRANSLATE_NOOP("gamepadMapping", "Start")}, //START
{0, 0, 0, "Prev_Select", QT_TRANSLATE_NOOP("gamepadMapping", "Select")}, //SELECT
{0, 4, 0, "Prev_Up", QT_TRANSLATE_NOOP("gamepadMapping", "Up")}, //UP
{0, 6, 0, "Prev_Down", QT_TRANSLATE_NOOP("gamepadMapping", "Down")}, //DOWN
{0, 7, 0, "Prev_Left", QT_TRANSLATE_NOOP("gamepadMapping", "Left")}, //LEFT
{0, 5, 0, "Prev_Right", QT_TRANSLATE_NOOP("gamepadMapping", "Right")}, //RIGHT
{0, 0, 0, ""}, //MENU (event)
{0, 16, 0, "Prev_Home", QT_TRANSLATE_NOOP("gamepadMapping", "Home")}, //BACK
// Special case for analog stick
{1, 0, -1, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_ALeft"), QT_TRANSLATE_NOOP("gamepadMapping", "Stick left")},
{1, 0, 1, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_ARight"), QT_TRANSLATE_NOOP("gamepadMapping", "Stick right")},
{1, 1, -1, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_AUp"), QT_TRANSLATE_NOOP("gamepadMapping", "Stick up")},
{1, 1, 1, QT_TRANSLATE_NOOP("gamepadMapping", "Prev_ADown"), QT_TRANSLATE_NOOP("gamepadMapping", "Stick bottom")}
{1, 0, -1, "Prev_ALeft", QT_TRANSLATE_NOOP("gamepadMapping", "Stick left")},
{1, 0, 1, "Prev_ARight", QT_TRANSLATE_NOOP("gamepadMapping", "Stick right")},
{1, 1, -1, "Prev_AUp", QT_TRANSLATE_NOOP("gamepadMapping", "Stick up")},
{1, 1, 1, "Prev_ADown", QT_TRANSLATE_NOOP("gamepadMapping", "Stick bottom")}
};
// id for mapping in config start at offset 200 to not get over key mapping
@ -65,7 +65,7 @@ GamePadDialog::GamePadDialog(InputState* state, QWidget *parent) :
for(int i=0;i<18;i++)
{
QLabel* labelPreview = findChild<QLabel*>(tr(GamepadPadMapping[i].ViewLabelName.toStdString().c_str()));
QLabel* labelPreview = findChild<QLabel*>(GamepadPadMapping[i].ViewLabelName);
if(labelPreview)
{
labelPreview->setVisible(false);
@ -179,7 +179,7 @@ void GamePadDialog::pollJoystick()
}
else if(GamepadPadMapping[i].mapping_type == 2)
val = SDL_JoystickGetHat(m_joystick,GamepadPadMapping[i].mapping_in);
QLabel* labelPreview = findChild<QLabel*>(tr(GamepadPadMapping[i].ViewLabelName.toStdString().c_str()));
QLabel* labelPreview = findChild<QLabel*>(GamepadPadMapping[i].ViewLabelName);
if(labelPreview)
{
labelPreview->setVisible(val != 0);
@ -211,7 +211,7 @@ void GamePadDialog::pollJoystick()
}
else if(GamepadPadMapping[i].mapping_type == 2)
val = SDL_JoystickGetHat(m_joystick,GamepadPadMapping[i].mapping_in);
QLabel* labelPreview = findChild<QLabel*>(tr(GamepadPadMapping[i].ViewLabelName.toStdString().c_str()));
QLabel* labelPreview = findChild<QLabel*>(GamepadPadMapping[i].ViewLabelName);
if(labelPreview)
{
labelPreview->setVisible(val != 0);

1
Qt/gamepaddialog.h
View File

@ -25,6 +25,7 @@ public:
void CalibNextButton();
protected:
void showEvent(QShowEvent *);
void changeEvent(QEvent *);
private slots:
void releaseLock();
void on_refreshListBtn_clicked();

85
Qt/languages/ppsspp_en.ts
View File

@ -545,171 +545,86 @@
</context>
<context>
<name>gamepadMapping</name>
<message>
<location filename="../gamepaddialog.cpp" line="19"/>
<source>Prev_X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="19"/>
<source>Cross</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="20"/>
<source>Prev_O</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="20"/>
<source>Circle</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="21"/>
<source>Prev_S</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="21"/>
<source>Square</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="22"/>
<source>Prev_T</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="22"/>
<source>Triangle</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="23"/>
<source>Prev_LT</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="23"/>
<source>Left Trigger</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="24"/>
<source>Prev_RT</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="24"/>
<source>Right Trigger</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="25"/>
<source>Prev_Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="25"/>
<source>Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="26"/>
<source>Prev_Select</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="26"/>
<source>Select</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="27"/>
<source>Prev_Up</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="27"/>
<source>Up</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="28"/>
<source>Prev_Down</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="28"/>
<source>Down</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="29"/>
<source>Prev_Left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="29"/>
<source>Left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="30"/>
<source>Prev_Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="30"/>
<source>Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="32"/>
<source>Prev_Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="32"/>
<source>Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="35"/>
<source>Prev_ALeft</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="35"/>
<source>Stick left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="36"/>
<source>Prev_ARight</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="36"/>
<source>Stick right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="37"/>
<source>Prev_AUp</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="37"/>
<source>Stick up</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="38"/>
<source>Prev_ADown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="38"/>
<source>Stick bottom</source>

85
Qt/languages/ppsspp_pl.ts
View File

@ -545,171 +545,86 @@
</context>
<context>
<name>gamepadMapping</name>
<message>
<location filename="../gamepaddialog.cpp" line="19"/>
<source>Prev_X</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="19"/>
<source>Cross</source>
<translation>Krzyżyk</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="20"/>
<source>Prev_O</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="20"/>
<source>Circle</source>
<translation>Kółko</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="21"/>
<source>Prev_S</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="21"/>
<source>Square</source>
<translation>Kwadrat</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="22"/>
<source>Prev_T</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="22"/>
<source>Triangle</source>
<translation>Trójkąt</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="23"/>
<source>Prev_LT</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="23"/>
<source>Left Trigger</source>
<translation>Lewy trigger</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="24"/>
<source>Prev_RT</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="24"/>
<source>Right Trigger</source>
<translation>Prawy trigger</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="25"/>
<source>Prev_Start</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="25"/>
<source>Start</source>
<translation>Start</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="26"/>
<source>Prev_Select</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="26"/>
<source>Select</source>
<translation>Select</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="27"/>
<source>Prev_Up</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="27"/>
<source>Up</source>
<translation>Góra</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="28"/>
<source>Prev_Down</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="28"/>
<source>Down</source>
<translation>Dół</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="29"/>
<source>Prev_Left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="29"/>
<source>Left</source>
<translation>Lewo</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="30"/>
<source>Prev_Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="30"/>
<source>Right</source>
<translation>Prawo</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="32"/>
<source>Prev_Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="32"/>
<source>Home</source>
<translation>Klawisz Home</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="35"/>
<source>Prev_ALeft</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="35"/>
<source>Stick left</source>
<translation>Lewo (analog)</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="36"/>
<source>Prev_ARight</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="36"/>
<source>Stick right</source>
<translation>Prawo (analog)</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="37"/>
<source>Prev_AUp</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="37"/>
<source>Stick up</source>
<translation>Góra (analog)</translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="38"/>
<source>Prev_ADown</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../gamepaddialog.cpp" line="38"/>
<source>Stick bottom</source>