Skip to content

W
wine-cw
Commit 6cc99681 authored by Lucas Zawacki's avatar Lucas Zawacki Committed by Alexandre Julliard
Browse files
Options

joy.cpl: Hardcode axis name strings that were in joy.rc.

parent 9e12bc01
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 544 deletions
dlls/joy.cpl/joy.h
View file @ 6cc99681
......@@ -68,6 +68,9 @@ struct JoystickData {
#define IDC_BUTTONENABLE 2002
#define IDC_DISABLEDLIST 2003
#define IDC_TESTSELECTCOMBO 2004
#define IDC_TESTGROUPXY 2005
#define IDC_TESTGROUPRXRY 2006
#define IDC_TESTGROUPZRZ 2007
#define IDC_JOYSTICKBUTTON 3000
#define IDC_JOYSTICKAXES 4000
......
dlls/joy.cpl/joy.rc
View file @ 6cc99681
......@@ -48,9 +48,9 @@ FONT 8, "Ms Shell Dlg"
{
COMBOBOX IDC_TESTSELECTCOMBO, 5, 5, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
GROUPBOX "Buttons", IDC_STATIC, 0, 110, 250, 90
GROUPBOX "X,Y", IDC_STATIC, 15, 30, 60, 60
GROUPBOX "Rx,Ry", IDC_STATIC, 92, 30, 60, 60
GROUPBOX "Z, Rz", IDC_STATIC, 169, 30, 60, 60
GROUPBOX "", IDC_TESTGROUPXY, 15, 30, 60, 60
GROUPBOX "", IDC_TESTGROUPRXRY, 92, 30, 60, 60
GROUPBOX "", IDC_TESTGROUPZRZ, 169, 30, 60, 60
}
IDD_FORCEFEEDBACK DIALOG 0, 0, 250, 200
......
dlls/joy.cpl/main.c
View file @ 6cc99681
......@@ -308,7 +308,9 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data)
struct Joystick *joy;
DIPROPRANGE propRange;
HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE);
static WCHAR button_class[] = {'B','u','t','t','o','n','\0'};
static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'};
static const WCHAR axes_names[TEST_MAX_AXES][7] = { {'X',',','Y','\0'}, {'R','x',',','R','y','\0'}, {'Z',',','R','z','\0'} };
static const DWORD axes_idc[TEST_MAX_AXES] = { IDC_TESTGROUPXY, IDC_TESTGROUPRXRY, IDC_TESTGROUPZRZ };
/* Set axis range to ease the GUI visualization */
for (i = 0; i < data->num_joysticks; i++)
......@@ -326,6 +328,9 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data)
for (i = 0; i < TEST_MAX_AXES; i++)
{
/* Set axis box name */
SetWindowTextW(GetDlgItem(hwnd, axes_idc[i]), axes_names[i]);
data->axes[i] = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE,
TEST_AXIS_X + TEST_NEXT_AXIS_X*i, TEST_AXIS_Y,
TEST_AXIS_SIZE_X, TEST_AXIS_SIZE_Y,
......
po/ar.po
View file @ 6cc99681
......@@ -3424,18 +3424,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/bg.po
View file @ 6cc99681
......@@ -3450,18 +3450,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/ca.po
View file @ 6cc99681
......@@ -3494,18 +3494,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/cs.po
View file @ 6cc99681
......@@ -3498,18 +3498,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/da.po
View file @ 6cc99681
......@@ -3470,18 +3470,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/de.po
View file @ 6cc99681
......@@ -3457,18 +3457,6 @@ msgstr "Joystick testen"
msgid "Buttons"
msgstr "Tasten"
#: joy.rc:51
msgid "X,Y"
msgstr "X,Y"
#: joy.rc:52
msgid "Rx,Ry"
msgstr "Rx,Ry"
#: joy.rc:53
msgid "Z, Rz"
msgstr "Z, Rz"
#: joy.rc:58
msgid "Test Force Feedback"
msgstr "Force Feedback testen"
......
po/el.po
View file @ 6cc99681
......@@ -3384,18 +3384,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/en.po
View file @ 6cc99681
......@@ -3448,18 +3448,6 @@ msgstr "Test Joystick"
msgid "Buttons"
msgstr "Buttons"
#: joy.rc:51
msgid "X,Y"
msgstr "X,Y"
#: joy.rc:52
msgid "Rx,Ry"
msgstr "Rx,Ry"
#: joy.rc:53
msgid "Z, Rz"
msgstr "Z, Rz"
#: joy.rc:58
msgid "Test Force Feedback"
msgstr "Test Force Feedback"
......
po/en_US.po
View file @ 6cc99681
......@@ -3450,18 +3450,6 @@ msgstr "Test Joystick"
msgid "Buttons"
msgstr "Buttons"
#: joy.rc:51
msgid "X,Y"
msgstr "X,Y"
#: joy.rc:52
msgid "Rx,Ry"
msgstr "Rx,Ry"
#: joy.rc:53
msgid "Z, Rz"
msgstr "Z, Rz"
#: joy.rc:58
msgid "Test Force Feedback"
msgstr "Test Force Feedback"
......
po/eo.po
View file @ 6cc99681
......@@ -3360,18 +3360,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/es.po
View file @ 6cc99681
......@@ -3484,18 +3484,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/fa.po
View file @ 6cc99681
......@@ -3424,18 +3424,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/fi.po
View file @ 6cc99681
......@@ -3445,18 +3445,6 @@ msgstr "Testaa joystickia"
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr "Testaa voimapalautetta"
......
po/fr.po
View file @ 6cc99681
......@@ -3480,18 +3480,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/he.po
View file @ 6cc99681
......@@ -3447,18 +3447,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/hi.po
View file @ 6cc99681
......@@ -3362,18 +3362,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/hu.po
View file @ 6cc99681
......@@ -3486,18 +3486,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/it.po
View file @ 6cc99681
......@@ -3494,18 +3494,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/ja.po
View file @ 6cc99681
......@@ -3442,18 +3442,6 @@ msgstr "ジョイスティックのテスト"
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr "フォース フィードバックのテスト"
......
po/ko.po
View file @ 6cc99681
......@@ -3446,18 +3446,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/lt.po
View file @ 6cc99681
......@@ -3458,18 +3458,6 @@ msgstr "Testuoti vairasvirtę"
msgid "Buttons"
msgstr "Mygtukai"
#: joy.rc:51
msgid "X,Y"
msgstr "X,Y"
#: joy.rc:52
msgid "Rx,Ry"
msgstr "Rx,Ry"
#: joy.rc:53
msgid "Z, Rz"
msgstr "Z, Rz"
#: joy.rc:58
msgid "Test Force Feedback"
msgstr "Testuoti „Force Feedback“"
......
po/ml.po
View file @ 6cc99681
......@@ -3362,18 +3362,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/nb_NO.po
View file @ 6cc99681
......@@ -3619,18 +3619,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/nl.po
View file @ 6cc99681
......@@ -3511,18 +3511,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/or.po
View file @ 6cc99681
......@@ -3362,18 +3362,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/pa.po
View file @ 6cc99681
......@@ -3362,18 +3362,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/pl.po
View file @ 6cc99681
......@@ -3470,18 +3470,6 @@ msgstr "Testuj Joystick"
msgid "Buttons"
msgstr "Przyciski"
#: joy.rc:51
msgid "X,Y"
msgstr "X,Y"
#: joy.rc:52
msgid "Rx,Ry"
msgstr "Rx,Ry"
#: joy.rc:53
msgid "Z, Rz"
msgstr "Z, Rz"
#: joy.rc:58
msgid "Test Force Feedback"
msgstr "Testuj odczucie siły zwrotnej"
......
po/pt_BR.po
View file @ 6cc99681
......@@ -3492,18 +3492,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/pt_PT.po
View file @ 6cc99681
......@@ -3491,18 +3491,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/rm.po
View file @ 6cc99681
......@@ -3390,18 +3390,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/ro.po
View file @ 6cc99681
......@@ -3451,18 +3451,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/ru.po
View file @ 6cc99681
......@@ -3463,18 +3463,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/sk.po
View file @ 6cc99681
......@@ -3393,18 +3393,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/sl.po
View file @ 6cc99681
......@@ -3483,18 +3483,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/sr_RS@cyrillic.po
View file @ 6cc99681
......@@ -3481,18 +3481,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/sr_RS@latin.po
View file @ 6cc99681
......@@ -3559,18 +3559,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/sv.po
View file @ 6cc99681
......@@ -3440,18 +3440,6 @@ msgstr "Testa joysticken"
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr "Testa kraftåterkoppling"
......
po/te.po
View file @ 6cc99681
......@@ -3362,18 +3362,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/th.po
View file @ 6cc99681
......@@ -3401,18 +3401,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/tr.po
View file @ 6cc99681
......@@ -3355,18 +3355,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/uk.po
View file @ 6cc99681
......@@ -3477,18 +3477,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/wa.po
View file @ 6cc99681
......@@ -3409,18 +3409,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/wine.pot
View file @ 6cc99681
......@@ -3324,18 +3324,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/zh_CN.po
View file @ 6cc99681
......@@ -3370,18 +3370,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
po/zh_TW.po
View file @ 6cc99681
......@@ -3374,18 +3374,6 @@ msgstr ""
msgid "Buttons"
msgstr ""
#: joy.rc:51
msgid "X,Y"
msgstr ""
#: joy.rc:52
msgid "Rx,Ry"
msgstr ""
#: joy.rc:53
msgid "Z, Rz"
msgstr ""
#: joy.rc:58
msgid "Test Force Feedback"
msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment