From 4e2319c075d2de8610f0a98fda25c8ba216eb7ea Mon Sep 17 00:00:00 2001 From: RedDevilus Date: Thu, 30 Jul 2020 18:57:28 +0200 Subject: [PATCH] Lilypad-gui: Update descriptions/tooltips.(PR3457) DS4 is finicky sometimes with Directinput enabled and is best used with Xinput + Steam (Steam is recommended for all controllers). Alternative for DS4 is Ryochan7/DS4Windows (not main DS4Windows). --- plugins/LilyPad/Config.cpp | 1 + plugins/LilyPad/LilyPad.rc | 6 +++--- plugins/LilyPad/Tooltips.cpp | 11 ++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/plugins/LilyPad/Config.cpp b/plugins/LilyPad/Config.cpp index aa543e0a52..10bd7ec3dd 100644 --- a/plugins/LilyPad/Config.cpp +++ b/plugins/LilyPad/Config.cpp @@ -2343,6 +2343,7 @@ INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, L AddTooltip(IDC_PAD_LIST, hWnd); AddTooltip(IDC_PAD_TYPE, hWnd); AddTooltip(IDC_DIAG_LIST, hWnd); + AddTooltip(IDC_G_DI, hWnd); AddTooltip(IDC_G_XI, hWnd); AddTooltip(IDC_ANALOG_START1, hWnd); AddTooltip(ID_RESTORE_DEFAULTS, hWnd); diff --git a/plugins/LilyPad/LilyPad.rc b/plugins/LilyPad/LilyPad.rc index 5e795d2b57..fad68c4dd9 100644 --- a/plugins/LilyPad/LilyPad.rc +++ b/plugins/LilyPad/LilyPad.rc @@ -450,8 +450,8 @@ BEGIN CONTROL "Raw input",IDC_KB_RAW,"Button",BS_AUTORADIOBUTTON,22,40,112,10 CONTROL "DirectInput",IDC_KB_DI,"Button",BS_AUTORADIOBUTTON,22,52,112,10 GROUPBOX "Game Device APIs",IDC_STATIC,16,70,191,62 - CONTROL "DirectInput",IDC_G_DI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,82,65,10 - CONTROL "XInput",IDC_G_XI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,94,125,10 + CONTROL "DirectInput (Legacy)",IDC_G_DI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,82,100,10 + CONTROL "XInput (Modern)",IDC_G_XI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,94,100,10 CONTROL "DualShock 3 native mode (Requires libusb)",IDC_G_DS3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,106,155,10 CONTROL "Monitor when in background",IDC_BACKGROUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,118,107,10 GROUPBOX "Mouse API",IDC_STATIC,216,16,192,85 @@ -464,7 +464,7 @@ BEGIN GROUPBOX "Pads",IDC_STATIC,7,142,410,62 CONTROL "Port 1 Multitap",IDC_MULTITAP1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,152,63,10 CONTROL "Port 2 Multitap",IDC_MULTITAP2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,164,63,10 - CONTROL "Multiple bindings",IDC_MULTIPLE_BINDING, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,176,63,10 + CONTROL "Multiple bindings",IDC_MULTIPLE_BINDING, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,176,66,10 CONTROL "",IDC_PAD_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_TABSTOP,81,151,183,48,WS_EX_CLIENTEDGE COMBOBOX IDC_PAD_TYPE,270,151,140,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Use analog mode if possible",IDC_ANALOG_START1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,270,168,137,10 diff --git a/plugins/LilyPad/Tooltips.cpp b/plugins/LilyPad/Tooltips.cpp index d534ebc76e..1fb2ae55d8 100644 --- a/plugins/LilyPad/Tooltips.cpp +++ b/plugins/LilyPad/Tooltips.cpp @@ -35,8 +35,8 @@ LPWSTR dialog_message(int ID, bool *updateText) L"Note 2: This does not enable the mouse to function as an in-game mouse in PS2 games that support a USB mouse or lightgun." L"This requires a USB plugin, while LilyPad is a PAD plugin(PAD means it emulates devices that are to be plugged into the PlayStation controller port that connects the DualShock 2 controller)."; case IDC_MOUSE_UNFOCUS: - return L"Starts the emulation without the mouse being in focus by the application.\n\n" - L"Without mouse focus, the mouse can still be used outside of the emulation.\nWith the mouse in focus it can only be used as an input for the emulator."; + return L"Enabled: Mouse is unfocused and can be used for emulation and outside it.\n\n" + L"Disabled: Mouse is focused and can be used for emulation."; case IDC_MULTIPLE_BINDING: return L"Allows binding multiple PS2 controls to one PC control, and binding conflicting controls on opposing ports and/or slots.\n\n" L"Also enables swapping different kinds of pad types(for example, between DS2 and Guitar) when right-clicking in the pad list."; @@ -63,8 +63,13 @@ LPWSTR dialog_message(int ID, bool *updateText) L"Double-click a device in the list or right-click it and select \"Test Device\" to display a continuously updated list of the state of all inputs on the selected device.\n" L"Use this option to check if all the inputs on a controller function properly.\n\n" L"Right-click and select \"Refresh\" to update the list of devices in case a recently connected device has not shown up yet."; + case IDC_G_DI: + return L"(Legacy) Enable this if your gamepad doesn't support Xinput.\n\n" + L"Disable for DualShock 4 (PS4 controllers) and probably others."; case IDC_G_XI: - return L"Xbox 360/Xbox One controllers (or devices/software imitating such) only"; + return L"For Xbox 360/ Xbox One controllers (or devices supporting Xinput).\n\n" + L"If it doesn't support Xinput then running through Steam as a non-Steam game might be required for the controllers to work properly.\n\n" + L"https://gamepad-tester.com/ to test your controller and check if it only says 'Xinput' on top."; case ID_RESTORE_DEFAULTS: return L"Restores the default contents of LilyPad.ini, undoing all settings changes and bindings that have been set up."; // Pad tabs