Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reuse translation for combo button as well

Browse Source
This commit is contained in:
iota97 committed 2021-08-30 13:17:24 +02:00
1 parent f417bb93d4
commit 8f9610d2a0
2 files changed
+34 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/ComboKeyMappingScreen.cpp
+2 -2
View File
@@ -178,7 +178,7 @@ void ComboKeyScreen::CreateViews() {
gridsettings.fillCells = true;
GridLayout *grid = vertLayout->Add(new GridLayout(gridsettings, new LayoutParams(FILL_PARENT, WRAP_CONTENT)));
// Button name, image and action are defined in GamepadEmu.h
// Button image and action are defined in GamepadEmu.h
for (int i = 0; i < ARRAY_SIZE(comboKeyList); ++i) {
LinearLayout *row = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
row->SetSpacing(0);
@@ -190,7 +190,7 @@ void ComboKeyScreen::CreateViews() {
if (comboKeyList[i].i.isValid()) {
choice = new Choice(comboKeyList[i].i, new LinearLayoutParams(1.0f));
} else {
choice = new Choice(mc->T(comboKeyList[i].n), new LinearLayoutParams(1.0f));
choice = new Choice(mc->T(KeyMap::GetPspButtonNameCharPointer(comboKeyList[i].c)), new LinearLayoutParams(1.0f));
}
ChoiceEventHandler *choiceEventHandler = new ChoiceEventHandler(checkbox);
UI/GamepadEmu.h
+32 -33
View File
@@ -270,44 +270,43 @@ namespace CustomKey {
// Button list
struct keyList {
const char* n; // UI name
ImageID i; // UI ImageID
uint32_t c; // Key code
};
static const keyList comboKeyList[] = {
{ "Square", ImageID("I_SQUARE"), CTRL_SQUARE },
{ "Triangle", ImageID("I_TRIANGLE"), CTRL_TRIANGLE },
{ "Circle", ImageID("I_CIRCLE"), CTRL_CIRCLE },
{ "Cross", ImageID("I_CROSS"), CTRL_CROSS },
{ "Up", ImageID::invalid(), CTRL_UP },
{ "Down", ImageID::invalid(), CTRL_DOWN },
{ "Left", ImageID::invalid(), CTRL_LEFT },
{ "Right", ImageID::invalid(), CTRL_RIGHT },
{ "Start", ImageID("I_START"), CTRL_START },
{ "Select", ImageID("I_SELECT"), CTRL_SELECT },
{ "L", ImageID("I_L"), CTRL_LTRIGGER },
{ "R", ImageID("I_R"), CTRL_RTRIGGER },
{ "RapidFire", ImageID::invalid(), VIRTKEY_RAPID_FIRE },
{ "Fast-forward", ImageID::invalid(), VIRTKEY_FASTFORWARD },
{ "SpeedToggle", ImageID::invalid(), VIRTKEY_SPEED_TOGGLE },
{ "Rewind", ImageID::invalid(), VIRTKEY_REWIND },
{ "Save State", ImageID::invalid(), VIRTKEY_SAVE_STATE },
{ "Load State", ImageID::invalid(), VIRTKEY_LOAD_STATE },
{ "Next Slot", ImageID::invalid(), VIRTKEY_NEXT_SLOT },
{ "Toggle Fullscreen", ImageID::invalid(), VIRTKEY_TOGGLE_FULLSCREEN },
{ "Alt speed 1", ImageID::invalid(), VIRTKEY_SPEED_CUSTOM1 },
{ "Alt speed 2", ImageID::invalid(), VIRTKEY_SPEED_CUSTOM2 },
{ "Texture Dumping", ImageID::invalid(), VIRTKEY_TEXTURE_DUMP },
{ "Texture Replacement", ImageID::invalid(), VIRTKEY_TEXTURE_REPLACE },
{ "Screenshot", ImageID::invalid(), VIRTKEY_SCREENSHOT },
{ "Mute toggle", ImageID::invalid(), VIRTKEY_MUTE_TOGGLE },
{ "OpenChat", ImageID::invalid(), VIRTKEY_OPENCHAT },
{ "Auto Analog Rotation (CW)", ImageID::invalid(), VIRTKEY_ANALOG_ROTATE_CW },
{ "Auto Analog Rotation (CCW)", ImageID::invalid(), VIRTKEY_ANALOG_ROTATE_CCW },
{ "Pause", ImageID::invalid(), VIRTKEY_PAUSE },
{ "DevMenu", ImageID::invalid(), VIRTKEY_DEVMENU },
{ ImageID("I_SQUARE"), CTRL_SQUARE },
{ ImageID("I_TRIANGLE"), CTRL_TRIANGLE },
{ ImageID("I_CIRCLE"), CTRL_CIRCLE },
{ ImageID("I_CROSS"), CTRL_CROSS },
{ ImageID::invalid(), CTRL_UP },
{ ImageID::invalid(), CTRL_DOWN },
{ ImageID::invalid(), CTRL_LEFT },
{ ImageID::invalid(), CTRL_RIGHT },
{ ImageID("I_START"), CTRL_START },
{ ImageID("I_SELECT"), CTRL_SELECT },
{ ImageID("I_L"), CTRL_LTRIGGER },
{ ImageID("I_R"), CTRL_RTRIGGER },
{ ImageID::invalid(), VIRTKEY_RAPID_FIRE },
{ ImageID::invalid(), VIRTKEY_FASTFORWARD },
{ ImageID::invalid(), VIRTKEY_SPEED_TOGGLE },
{ ImageID::invalid(), VIRTKEY_REWIND },
{ ImageID::invalid(), VIRTKEY_SAVE_STATE },
{ ImageID::invalid(), VIRTKEY_LOAD_STATE },
{ ImageID::invalid(), VIRTKEY_NEXT_SLOT },
{ ImageID::invalid(), VIRTKEY_TOGGLE_FULLSCREEN },
{ ImageID::invalid(), VIRTKEY_SPEED_CUSTOM1 },
{ ImageID::invalid(), VIRTKEY_SPEED_CUSTOM2 },
{ ImageID::invalid(), VIRTKEY_TEXTURE_DUMP },
{ ImageID::invalid(), VIRTKEY_TEXTURE_REPLACE },
{ ImageID::invalid(), VIRTKEY_SCREENSHOT },
{ ImageID::invalid(), VIRTKEY_MUTE_TOGGLE },
{ ImageID::invalid(), VIRTKEY_OPENCHAT },
{ ImageID::invalid(), VIRTKEY_ANALOG_ROTATE_CW },
{ ImageID::invalid(), VIRTKEY_ANALOG_ROTATE_CCW },
{ ImageID::invalid(), VIRTKEY_PAUSE },
{ ImageID::invalid(), VIRTKEY_DEVMENU },
#ifndef MOBILE_DEVICE
{ "Record", ImageID::invalid(), VIRTKEY_RECORD },
{ ImageID::invalid(), VIRTKEY_RECORD },
#endif
};
static_assert(ARRAY_SIZE(comboKeyList) <= 64, "Too many key for a uint64_t bit mask");