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

fix typos of controller mapping dialog and virtual SB dialog. 

correct control names accordingly.
This commit is contained in:
jackchentwkh 2018-05-29 22:19:56 +08:00
parent 2d81b79587
commit 2ad3f2bad6
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
resource/Cxbx.rc
View File

@ -63,7 +63,7 @@ BEGIN
CONTROL "XInput Port 2",IDC_HOST_XINPUT_0_2,"Button",BS_AUTORADIOBUTTON,17,46,59,10
CONTROL "XInput Port 3",IDC_HOST_XINPUT_0_3,"Button",BS_AUTORADIOBUTTON,17,55,59,10
CONTROL "DirectInput Port 0",IDC_HOST_DINPUT_0_0,"Button",BS_AUTORADIOBUTTON,17,64,73,10
CONTROL "Virtual SteelBatalion",IDC_HOST_VIRTUAL_SBC_0_0,"Button",BS_AUTORADIOBUTTON,17,74,79,10
CONTROL "Virtual SteelBatallion",IDC_HOST_VIRTUAL_SBC_0_0,"Button",BS_AUTORADIOBUTTON,17,74,79,10
GROUPBOX "Xbox Port 1",IDC_XBOX_PORT_1,104,7,93,83,WS_GROUP,WS_EX_CLIENTEDGE
CONTROL "Not Connected",IDC_HOST_NOTCONNECT_1_0,"Button",BS_AUTORADIOBUTTON,114,20,64,10
CONTROL "XInput Port 0",IDC_HOST_XINPUT_1_0,"Button",BS_AUTORADIOBUTTON,114,29,59,10
@ -71,7 +71,7 @@ BEGIN
CONTROL "XInput Port 2",IDC_HOST_XINPUT_1_2,"Button",BS_AUTORADIOBUTTON,114,47,59,10
CONTROL "XInput Port 3",IDC_HOST_XINPUT_1_3,"Button",BS_AUTORADIOBUTTON,114,56,59,10
CONTROL "DirectInput Port 0",IDC_HOST_DINPUT_1_0,"Button",BS_AUTORADIOBUTTON,114,65,73,10
CONTROL "Virtual SteelBatalion",IDC_HOST_VIRTUAL_SBC_1_0,"Button",BS_AUTORADIOBUTTON,114,75,79,10
CONTROL "Virtual SteelBatallion",IDC_HOST_VIRTUAL_SBC_1_0,"Button",BS_AUTORADIOBUTTON,114,75,79,10
GROUPBOX "Xbox Port 2",IDC_XBOX_PORT_2,201,7,93,83,WS_GROUP,WS_EX_CLIENTEDGE
CONTROL "Not Connected",IDC_HOST_NOTCONNECT_2_0,"Button",BS_AUTORADIOBUTTON,211,21,64,10
CONTROL "XInput Port 0",IDC_HOST_XINPUT_2_0,"Button",BS_AUTORADIOBUTTON,211,30,59,10
@ -79,7 +79,7 @@ BEGIN
CONTROL "XInput Port 2",IDC_HOST_XINPUT_2_2,"Button",BS_AUTORADIOBUTTON,211,48,59,10
CONTROL "XInput Port 3",IDC_HOST_XINPUT_2_3,"Button",BS_AUTORADIOBUTTON,211,57,59,10
CONTROL "DirectInput Port 0",IDC_HOST_DINPUT_2_0,"Button",BS_AUTORADIOBUTTON,211,66,73,10
CONTROL "Virtual SteelBatalion",IDC_HOST_VIRTUAL_SBC_2_0,"Button",BS_AUTORADIOBUTTON,211,75,79,10
CONTROL "Virtual SteelBatallion",IDC_HOST_VIRTUAL_SBC_2_0,"Button",BS_AUTORADIOBUTTON,211,75,79,10
GROUPBOX "Xbox Port 3",IDC_XBOX_PORT_3,298,7,93,83,WS_GROUP,WS_EX_CLIENTEDGE
CONTROL "Not Connected",IDC_HOST_NOTCONNECT_3_0,"Button",BS_AUTORADIOBUTTON,308,21,64,10
CONTROL "XInput Port 0",IDC_HOST_XINPUT_3_0,"Button",BS_AUTORADIOBUTTON,308,30,59,10
@ -87,7 +87,7 @@ BEGIN
CONTROL "XInput Port 2",IDC_HOST_XINPUT_3_2,"Button",BS_AUTORADIOBUTTON,308,48,59,10
CONTROL "XInput Port 3",IDC_HOST_XINPUT_3_3,"Button",BS_AUTORADIOBUTTON,308,57,59,10
CONTROL "DirectInput Port 0",IDC_HOST_DINPUT_3_0,"Button",BS_AUTORADIOBUTTON,308,66,73,10
CONTROL "Virtual SteelBatalion",IDC_HOST_VIRTUAL_SBC_3_0,"Button",BS_AUTORADIOBUTTON,308,75,79,10
CONTROL "Virtual SteelBatallion",IDC_HOST_VIRTUAL_SBC_3_0,"Button",BS_AUTORADIOBUTTON,308,75,79,10
END
IDD_VIRTUAL_SBC_FEEDBACK DIALOGEX 0, 0, 1039, 214
@ -116,12 +116,12 @@ BEGIN
CONTROL "OXYGEN SUPPLY SYSTEM",IDC_OXYGEN_SUPPLY_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,135,96,10
CONTROL "FILT CONTROL SYSTEM",IDC_FILT_CONTROL_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,165,91,10
PUSHBUTTON "Eject",IDC_BTN_EJECT,958,42,60,11
PUSHBUTTON "COCKIT HATCH",IDC_BTN_COCKIT_HATCH,958,93,60,12,BS_BOTTOM
PUSHBUTTON "IGINITION",IDC_BTN_IGINITION,958,144,60,11,BS_BOTTOM
PUSHBUTTON "COCKPIT HATCH",IDC_BTN_COCKPIT_HATCH,958,93,60,12,BS_BOTTOM
PUSHBUTTON "IGNITION",IDC_BTN_IGNITION,958,144,60,11,BS_BOTTOM
PUSHBUTTON "START",IDC_BTN_START,958,192,60,10,BS_BOTTOM
CONTROL "",IDC_PB_EJECT,"msctls_progress32",WS_BORDER,958,15,60,26
CONTROL "",IDC_PB_COCKPIT_HATCH,"msctls_progress32",WS_BORDER,958,67,60,26
CONTROL "",IDC_PB_IGINITION,"msctls_progress32",WS_BORDER,958,117,60,26
CONTROL "",IDC_PB_IGNITION,"msctls_progress32",WS_BORDER,958,117,60,26
CONTROL "",IDC_PB_START,"msctls_progress32",WS_BORDER,958,165,60,26
CONTROL "",IDC_PB_GEARLEVER_5,"msctls_progress32",WS_BORDER,62,41,29,10
CONTROL "",IDC_PB_GEARLEVER_1,"msctls_progress32",WS_BORDER,62,113,29,10
@ -136,9 +136,9 @@ BEGIN
CONTROL "",IDC_PB_COM3,"msctls_progress32",WS_BORDER,399,12,14,27
CONTROL "",IDC_PB_COM4,"msctls_progress32",WS_BORDER,427,12,14,27
CONTROL "",IDC_PB_WASHING,"msctls_progress32",WS_BORDER,359,151,86,13
CONTROL "",IDC_PB_MAIN_WAPON_CONTROL,"msctls_progress32",WS_BORDER,359,179,86,13
CONTROL "",IDC_PB_MAIN_WEAPON_CONTROL,"msctls_progress32",WS_BORDER,359,179,86,13
CONTROL "",IDC_PB_EXTINGUISHER,"msctls_progress32",WS_BORDER,481,151,86,13
CONTROL "",IDC_PB_SUB_WAPON_CONTROL,"msctls_progress32",WS_BORDER,481,179,86,13
CONTROL "",IDC_PB_SUB_WEAPON_CONTROL,"msctls_progress32",WS_BORDER,481,179,86,13
CONTROL "",IDC_PB_CHAFF,"msctls_progress32",WS_BORDER,603,151,86,13
CONTROL "",IDC_PB_MAGAZINE_CHANGE,"msctls_progress32",WS_BORDER,603,179,86,13
CONTROL "",IDC_PB_FUNC1,"msctls_progress32",WS_BORDER,507,20,14,27
@ -163,10 +163,10 @@ BEGIN
PUSHBUTTON "OPEN/CLOSE",IDC_BTN_OPEN_CLOSE,788,77,56,21
PUSHBUTTON "MAP ZOOM IN/OUT",IDC_BTN_MAP_ZOON_IN_OUT,860,77,56,21,BS_MULTILINE
LTEXT "MULTI MONITOR",IDC_STATIC,716,99,55,8
LTEXT "Main Monitor Zoom",IDC_STATIC,718,163,61,8
LTEXT "MAIN MONITOR ZOOM",IDC_STATIC,718,163,61,8
GROUPBOX "",IDC_STATIC,949,59,83,148,0,WS_EX_CLIENTEDGE
PUSHBUTTON "MAIN WAPON CONTROL",IDC_BTN_MAIN_WAPON_CONTROL,359,193,86,13
PUSHBUTTON "SUB WAPON CTONTROL",IDC_BTN_SUB_WAPON_CONTROL,481,192,86,13
PUSHBUTTON "MAIN WAPON CONTROL",IDC_BTN_MAIN_WEAPON_CONTROL,359,193,86,13
PUSHBUTTON "SUB WAPON CTONTROL",IDC_BTN_SUB_WEAPON_CONTROL,481,192,86,13
PUSHBUTTON "EXTINGUISHER",IDC_BTN_EXTINGUISHER,481,162,86,13
PUSHBUTTON "MAGAZINE CHANGE",IDC_BTN_MAGAZINE_CHANGE,603,192,86,13
PUSHBUTTON "CHAFF",IDC_BTN_CHAFF,603,162,86,13

14
src/Cxbx/ResCxbx.h
View File

@ -50,8 +50,8 @@
#define IDC_CONFIGURE_ALL 1030
#define IDC_BTN_EJECT 1030
#define IDC_BUTTON2 1031
#define IDC_BTN_COCKIT_HATCH 1031
#define IDC_BTN_IGINITION 1032
#define IDC_BTN_COCKPIT_HATCH 1031
#define IDC_BTN_IGNITION 1032
#define IDC_BTN_START 1033
#define IDC_CV_FULLSCREEN 1034
#define IDC_BTN_ZOOM_IN 1034
@ -63,9 +63,9 @@
#define IDC_BTN_OPEN_CLOSE 1038
#define IDC_BTN_MAP_ZOON_IN_OUT 1039
#define IDC_VC_ACCEPT 1040
#define IDC_BTN_MAIN_WAPON_CONTROL 1040
#define IDC_BTN_MAIN_WEAPON_CONTROL 1040
#define IDC_VC_CANCEL 1041
#define IDC_BTN_SUB_WAPON_CONTROL 1041
#define IDC_BTN_SUB_WEAPON_CONTROL 1041
#define IDC_CV_VSYNC 1042
#define IDC_BTN_EXTINGUISHER 1042
#define IDC_BTN_MAGAZINE_CHANGE 1043
@ -171,7 +171,7 @@
#define IDC_FILT_CONTROL_SYSTEM 1217
#define IDC_PB_EJECT 1218
#define IDC_PB_COCKPIT_HATCH 1219
#define IDC_PB_IGINITION 1220
#define IDC_PB_IGNITION 1220
#define IDC_PB_START 1221
#define IDC_PB_GEARLEVER_5 1222
#define IDC_PB_GEARLEVER_1 1223
@ -186,10 +186,10 @@
#define IDC_PB_COM3 1232
#define IDC_PB_COM4 1233
#define IDC_PB_WASHING 1234
#define IDC_PB_MAIN_WAPON_CONTROL 1235
#define IDC_PB_MAIN_WEAPON_CONTROL 1235
#define IDC_PB_EXTINGUISHER 1236
#define IDC_PB_SUB 1237
#define IDC_PB_SUB_WAPON_CONTROL 1237
#define IDC_PB_SUB_WEAPON_CONTROL 1237
#define IDC_PB_CHAFF 1238
#define IDC_PB_MAGAZINE_CHANGE 1239
#define IDC_PB_FUNC1 1240

6
src/CxbxVSBC/DlgVirtualSBCFeedback.cpp
View File

@ -65,7 +65,7 @@ namespace DlgVSBCFeedback
int DlgItemIDArray[] = {
IDC_PB_EJECT,
IDC_PB_COCKPIT_HATCH,
IDC_PB_IGINITION,
IDC_PB_IGNITION,
IDC_PB_START,
IDC_PB_OPEN_CLOSE,
IDC_PB_MAP_ZOOM_IN_OUT,
@ -85,8 +85,8 @@ namespace DlgVSBCFeedback
IDC_PB_FUNC1,
IDC_PB_FUNC2,
IDC_PB_FUNC3,
IDC_PB_MAIN_WAPON_CONTROL,
IDC_PB_SUB_WAPON_CONTROL,
IDC_PB_MAIN_WEAPON_CONTROL,
IDC_PB_SUB_WEAPON_CONTROL,
IDC_PB_MAGAZINE_CHANGE,
IDC_PB_COM1,
IDC_PB_COM2,