Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove unused string and update en_US translation

Browse Source
This commit is contained in:
iota97 2021-09-22 23:14:35 +02:00
parent e8ad59371d
commit 0b5eabcd23
2 changed files with 38 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
UI/GamepadEmu.h
View File

@ -212,44 +212,42 @@ protected:
namespace CustomKey {
// Image list
struct keyImage {
const char* n; // UI name
ImageID i; // ImageID
float r; // Rotation angle in degree
};
static const keyImage comboKeyImages[] = {
{ "1", ImageID("I_1"), 0.0f },
{ "2", ImageID("I_2"), 0.0f },
{ "3", ImageID("I_3"), 0.0f },
{ "4", ImageID("I_4"), 0.0f },
{ "5", ImageID("I_5"), 0.0f },
{ "6", ImageID("I_6"), 0.0f },
{ "A", ImageID("I_A"), 0.0f },
{ "B", ImageID("I_B"), 0.0f },
{ "C", ImageID("I_C"), 0.0f },
{ "D", ImageID("I_D"), 0.0f },
{ "E", ImageID("I_E"), 0.0f },
{ "F", ImageID("I_F"), 0.0f },
{ "Circle", ImageID("I_CIRCLE"), 0.0f },
{ "Cross", ImageID("I_CROSS"), 0.0f },
{ "Square", ImageID("I_SQUARE"), 0.0f },
{ "Triangle", ImageID("I_TRIANGLE"), 0.0f },
{ "L", ImageID("I_L"), 0.0f },
{ "R", ImageID("I_R"), 0.0f },
{ "Start", ImageID("I_START"), 0.0f },
{ "Select", ImageID("I_SELECT"), 0.0f },
{ "Plus", ImageID("I_CROSS"), 45.0f },
{ "Rhombus", ImageID("I_SQUARE"), 45.0f },
{ "Down Triangle", ImageID("I_TRIANGLE"), 180.0f },
{ "Arrow up", ImageID("I_ARROW"), 90.0f},
{ "Arrow down", ImageID("I_ARROW"), 270.0f},
{ "Arrow left", ImageID("I_ARROW"), 0.0f},
{ "Arrow right", ImageID("I_ARROW"), 180.0f},
{ "Gear", ImageID("I_GEAR"), 0.0f},
{ ImageID("I_1"), 0.0f },
{ ImageID("I_2"), 0.0f },
{ ImageID("I_3"), 0.0f },
{ ImageID("I_4"), 0.0f },
{ ImageID("I_5"), 0.0f },
{ ImageID("I_6"), 0.0f },
{ ImageID("I_A"), 0.0f },
{ ImageID("I_B"), 0.0f },
{ ImageID("I_C"), 0.0f },
{ ImageID("I_D"), 0.0f },
{ ImageID("I_E"), 0.0f },
{ ImageID("I_F"), 0.0f },
{ ImageID("I_CIRCLE"), 0.0f },
{ ImageID("I_CROSS"), 0.0f },
{ ImageID("I_SQUARE"), 0.0f },
{ ImageID("I_TRIANGLE"), 0.0f },
{ ImageID("I_L"), 0.0f },
{ ImageID("I_R"), 0.0f },
{ ImageID("I_START"), 0.0f },
{ ImageID("I_SELECT"), 0.0f },
{ ImageID("I_CROSS"), 45.0f },
{ ImageID("I_SQUARE"), 45.0f },
{ ImageID("I_TRIANGLE"), 180.0f },
{ ImageID("I_ARROW"), 90.0f},
{ ImageID("I_ARROW"), 270.0f},
{ ImageID("I_ARROW"), 0.0f},
{ ImageID("I_ARROW"), 180.0f},
{ ImageID("I_GEAR"), 0.0f},
};
// Shape list
struct keyShape {
const char* n; // UI name
ImageID i; // ImageID
ImageID l; // ImageID line version
float r; // Rotation angle in dregree
@ -257,16 +255,16 @@ namespace CustomKey {
bool d; // Invert height and width for context dimension (for example for 90 degree rot)
};
static const keyShape comboKeyShapes[] = {
{ "Circle", ImageID("I_ROUND"), ImageID("I_ROUND_LINE"), 0.0f, false, false },
{ "Rectangle", ImageID("I_RECT"), ImageID("I_RECT_LINE"), 0.0f, false, false },
{ "Vertical Rectangle", ImageID("I_RECT"), ImageID("I_RECT_LINE"), 90.0f, false, true },
{ "L button", ImageID("I_SHOULDER"), ImageID("I_SHOULDER_LINE"), 0.0f, false, false },
{ "R button", ImageID("I_SHOULDER"), ImageID("I_SHOULDER_LINE"), 0.0f, true, false },
{ "Arrow up", ImageID("I_DIR"), ImageID("I_DIR_LINE"), 270.0f, false, true },
{ "Arrow down", ImageID("I_DIR"), ImageID("I_DIR_LINE"), 90.0f, false, true },
{ "Arrow left", ImageID("I_DIR"), ImageID("I_DIR_LINE"), 180.0f, false, false },
{ "Arrow right", ImageID("I_DIR"), ImageID("I_DIR_LINE"), 0.0f, false, false },
{ "Square", ImageID("I_SQUARE_SHAPE"), ImageID("I_SQUARE_SHAPE_LINE"), 0.0f, false, false },
{ ImageID("I_ROUND"), ImageID("I_ROUND_LINE"), 0.0f, false, false },
{ ImageID("I_RECT"), ImageID("I_RECT_LINE"), 0.0f, false, false },
{ ImageID("I_RECT"), ImageID("I_RECT_LINE"), 90.0f, false, true },
{ ImageID("I_SHOULDER"), ImageID("I_SHOULDER_LINE"), 0.0f, false, false },
{ ImageID("I_SHOULDER"), ImageID("I_SHOULDER_LINE"), 0.0f, true, false },
{ ImageID("I_DIR"), ImageID("I_DIR_LINE"), 270.0f, false, true },
{ ImageID("I_DIR"), ImageID("I_DIR_LINE"), 90.0f, false, true },
{ ImageID("I_DIR"), ImageID("I_DIR_LINE"), 180.0f, false, false },
{ ImageID("I_DIR"), ImageID("I_DIR_LINE"), 0.0f, false, false },
{ ImageID("I_SQUARE_SHAPE"), ImageID("I_SQUARE_SHAPE_LINE"), 0.0f, false, false },
};
// Button list

12
assets/lang/en_US.ini
View File

@ -674,10 +674,6 @@ An.Right = Analog Right
An.Up = Analog Up
Analog limiter = Analog limiter
Analog Stick = Analog stick
Arrow down = Arrow down
Arrow left = Arrow left
Arrow right = Arrow right
Arrow up = Arrow up
Audio/Video Recording = Audio/Video recording
Auto Analog Rotation (CCW) = Auto analog rotation (CCW)
Auto Analog Rotation (CW) = Auto analog rotation (CW)
@ -701,14 +697,11 @@ D-pad up = D-pad up
DevMenu = DevMenu
Double tap button = Double tap button
Down = Dpad Down
Down Triangle = Down Triangle
Dpad = Dpad
Frame Advance = Frame advance
Gear = Gear
Hold = Hold
Home = Home
L = L
L button = L button
Left = Dpad Left
Load State = Load state
Mute toggle = Mute toggle
@ -717,15 +710,11 @@ None = None
Note = Note
OpenChat = Open chat
Pause = Pause
Plus = Plus
R = R
R button = R button
RapidFire = Rapid-fire
Record = Record
Rectangle = Rectangle
Remote hold = Remote hold
Rewind = Rewind
Rhombus = Rhombus
Right = Dpad Right
Right Analog Stick = Right Analog Stick
RightAn.Down = RightAn.Down
@ -753,7 +742,6 @@ Toggle mode = Toggle mode
Triangle = Triangle
Fast-forward = Fast-forward
Up = Dpad Up
Vertical Rectangle = Vertical Rectangle
Vol + = Vol +
Vol - = Vol -
Wlan = WLAN