diff --git a/desmume/src/windows/main.c b/desmume/src/windows/main.c index af5eb43f5..c3bca524e 100644 --- a/desmume/src/windows/main.c +++ b/desmume/src/windows/main.c @@ -439,12 +439,17 @@ void SetLanguage(int langid) { case 1: // French - SetThreadLocale(MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + SetThreadLocale(MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), + SORT_DEFAULT)); + break; + case 2: + // Danish + SetThreadLocale(MAKELCID(MAKELANGID(LANG_DANISH, SUBLANG_DEFAULT), SORT_DEFAULT)); break; case 0: // English - SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), + SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)); break; default: break; @@ -1404,6 +1409,11 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM ChangeLanguage(1); CheckLanguage(LOWORD(wParam)); return 0; + case IDC_LANGDANISH: + SaveLanguage(1); + ChangeLanguage(2); + CheckLanguage(LOWORD(wParam)); + return 0; case IDM_WEBSITE: ShellExecute(NULL, "open", "http://desmume.sourceforge.net", NULL, NULL, SW_SHOWNORMAL); return 0; diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index 8ffb9597a..73784395d 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -135,6 +135,7 @@ void refreshAll(); #define IDC_LANGENGLISH 210 #define IDC_LANGFRENCH 211 +#define IDC_LANGDANISH 212 #define IDD_MEM_VIEWER 301 #define IDC_8_BIT 302 diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index fbc1788a2..a30a58875 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -742,9 +742,84 @@ BEGIN PUSHBUTTON "&Close",IDC_FERMER,4,300,50,14 END +IDD_OAM DIALOG DISCARDABLE 0, 0, 300, 200//150, 150 +STYLE WS_SYSMENU +CAPTION "OAM Viewer" +FONT 8, "MS Sans Serif" +BEGIN + COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | CBS_DROPDOWN + SCROLLBAR IDC_SCROLLER,48,20,20,14, SBS_HORZ + LTEXT "Mode :",IDC_STATIC,4,36,45,8 + LTEXT "Tile :",IDC_STATIC,4,46,45,8 + LTEXT "Palette :",IDC_STATIC,4,56,45,8 + LTEXT "Prio :",IDC_STATIC,4,66,45,8 + LTEXT "Coordinates :",IDC_STATIC,4,76,45,8 + LTEXT "Dimensions :",IDC_STATIC,4,86,45,8 + LTEXT "Rotation :",IDC_STATIC,4,96,45,8 + LTEXT "Mosaic :",IDC_STATIC,4,106,45,8 + LTEXT "OAM : 0",IDC_OAMNUM,4,24,40,8 + LTEXT "",IDC_MODE,48,36,42,8 + LTEXT "",IDC_TILE,48,46,72,8 + LTEXT "",IDC_PAL,48,56,72,8 + LTEXT "",IDC_PRIO,48,66,72,8 + LTEXT "",IDC_COOR,48,76,42,8 + LTEXT "",IDC_DIM,48,86,42,8 + LTEXT "",IDC_ROT,48,96,42,8 + LTEXT "",IDC_MOS,48,106,42,8 + LTEXT "",IDC_PROP0,4,116,86,8 + LTEXT "",IDC_PROP1,4,126,86,8 +// CONTROL "Edit", IDC_OAM_BOX,"OAMViewBox",WS_TABSTOP,100,50,45,42,WS_EX_CLIENTEDGE + PUSHBUTTON "&Close",IDC_FERMER,50,134,50,14 +END + +SOUNDSETTINGSDLG DIALOG DISCARDABLE 0, 0, 174, 96 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Sound Settings" +FONT 8, "MS Sans Serif" +BEGIN + GROUPBOX "Sound Core Settings", -1, 3, 2, 168, 28, WS_CHILD | WS_VISIBLE + LTEXT "Sound Core", -1, 10, 14, 40, 10 + COMBOBOX IDC_SOUNDCORECB, 54, 13, 110, 33, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Other Settings", -1, 3, 31, 168, 43, WS_CHILD | WS_VISIBLE + LTEXT "Buffer Size", -1, 10, 42, 60, 10 + EDITTEXT IDC_SOUNDBUFFERET, 136, 41, 28, 13 + LTEXT "Volume", -1, 10, 57, 30, 10 + CONTROL "", IDC_SLVOLUME, "msctls_trackbar32", WS_VISIBLE | WS_CHILD, 40, 57, 128, 10 + DEFPUSHBUTTON "&OK",IDOK,82,78,40,14 + PUSHBUTTON "&Cancel",IDCANCEL,127,78,40,14 +END + + +IDD_FIRMSETTINGS DIALOG DISCARDABLE 0, 0, 161, 145 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Firmware Settings" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "&OK",IDOK,7,124,50,14 + PUSHBUTTON "&Cancel",IDCANCEL,104,124,50,14 + CONTROL "Favourite Color:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | + WS_GROUP,9,55,52,12 + COMBOBOX IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Birth Month:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | + WS_GROUP,9,72,52,12 + COMBOBOX IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Birthday:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | + WS_GROUP,9,90,52,12 + COMBOBOX IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Language:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | + WS_GROUP,9,106,52,12 + COMBOBOX IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Nickname:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | + WS_GROUP,9,17,52,12 + EDITTEXT IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP + CONTROL "Message:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | + WS_GROUP,9,36,52,12 + EDITTEXT IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP +END + // DANISH //////////////////////////////////////////////////////////////////// -LANGUAGE LANG_DANISH,SUBLANG_DANISH +LANGUAGE LANG_DANISH,SUBLANG_DEFAULT #pragma code_page(1252) MENU_PRINCIPAL MENU @@ -1095,8 +1170,7 @@ BEGIN LTEXT "",IDC_SCR,48,60,85,8 LTEXT "",IDC_MSIZE,48,70,85,8 LTEXT "",IDC_SCROLL,48,80,85,8 - // CONTROL "Rediger", IDC_MAP_BOX,"MapViewBox",WS_TABSTOP | - WS_VSCROLL | WS_HSCROLL,4,16,296,150,WS_EX_CLIENTEDGE + // CONTROL "Rediger", IDC_MAP_BOX,"MapViewBox",WS_TABSTOP | WS_VSCROLL | WS_HSCROLL,4,16,296,150,WS_EX_CLIENTEDGE PUSHBUTTON "&Luk",IDC_FERMER,4,300,50,14 END @@ -1126,8 +1200,7 @@ BEGIN LTEXT "",IDC_MOS,48,106,42,8 LTEXT "",IDC_PROP0,4,116,86,8 LTEXT "",IDC_PROP1,4,126,86,8 - // CONTROL "Rediger", - IDC_OAM_BOX,"OAMViewBox",WS_TABSTOP,100,50,45,42,WS_EX_CLIENTEDGE + // CONTROL "Rediger", IDC_OAM_BOX,"OAMViewBox",WS_TABSTOP,100,50,45,42,WS_EX_CLIENTEDGE PUSHBUTTON "&Luk",IDC_FERMER,50,134,50,14 END @@ -1169,80 +1242,9 @@ BEGIN EDITTEXT IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP END +////////////////////////////////////////////////////////////////////////////// -IDD_OAM DIALOG DISCARDABLE 0, 0, 300, 200//150, 150 -STYLE WS_SYSMENU -CAPTION "OAM Viewer" -FONT 8, "MS Sans Serif" -BEGIN - COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | CBS_DROPDOWN - SCROLLBAR IDC_SCROLLER,48,20,20,14, SBS_HORZ - LTEXT "Mode :",IDC_STATIC,4,36,45,8 - LTEXT "Tile :",IDC_STATIC,4,46,45,8 - LTEXT "Palette :",IDC_STATIC,4,56,45,8 - LTEXT "Prio :",IDC_STATIC,4,66,45,8 - LTEXT "Coordinates :",IDC_STATIC,4,76,45,8 - LTEXT "Dimensions :",IDC_STATIC,4,86,45,8 - LTEXT "Rotation :",IDC_STATIC,4,96,45,8 - LTEXT "Mosaic :",IDC_STATIC,4,106,45,8 - LTEXT "OAM : 0",IDC_OAMNUM,4,24,40,8 - LTEXT "",IDC_MODE,48,36,42,8 - LTEXT "",IDC_TILE,48,46,72,8 - LTEXT "",IDC_PAL,48,56,72,8 - LTEXT "",IDC_PRIO,48,66,72,8 - LTEXT "",IDC_COOR,48,76,42,8 - LTEXT "",IDC_DIM,48,86,42,8 - LTEXT "",IDC_ROT,48,96,42,8 - LTEXT "",IDC_MOS,48,106,42,8 - LTEXT "",IDC_PROP0,4,116,86,8 - LTEXT "",IDC_PROP1,4,126,86,8 -// CONTROL "Edit", IDC_OAM_BOX,"OAMViewBox",WS_TABSTOP,100,50,45,42,WS_EX_CLIENTEDGE - PUSHBUTTON "&Close",IDC_FERMER,50,134,50,14 -END - -SOUNDSETTINGSDLG DIALOG DISCARDABLE 0, 0, 174, 96 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sound Settings" -FONT 8, "MS Sans Serif" -BEGIN - GROUPBOX "Sound Core Settings", -1, 3, 2, 168, 28, WS_CHILD | WS_VISIBLE - LTEXT "Sound Core", -1, 10, 14, 40, 10 - COMBOBOX IDC_SOUNDCORECB, 54, 13, 110, 33, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Other Settings", -1, 3, 31, 168, 43, WS_CHILD | WS_VISIBLE - LTEXT "Buffer Size", -1, 10, 42, 60, 10 - EDITTEXT IDC_SOUNDBUFFERET, 136, 41, 28, 13 - LTEXT "Volume", -1, 10, 57, 30, 10 - CONTROL "", IDC_SLVOLUME, "msctls_trackbar32", WS_VISIBLE | WS_CHILD, 40, 57, 128, 10 - DEFPUSHBUTTON "&OK",IDOK,82,78,40,14 - PUSHBUTTON "&Cancel",IDCANCEL,127,78,40,14 -END - -IDD_FIRMSETTINGS DIALOG DISCARDABLE 0, 0, 161, 145 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Firmware Settings" -FONT 8, "MS Sans Serif" -BEGIN - DEFPUSHBUTTON "&OK",IDOK,7,124,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,104,124,50,14 - CONTROL "Favourite Color:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,55,52,12 - COMBOBOX IDC_COMBO1,66,53,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - CONTROL "Birth Month:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,72,52,12 - COMBOBOX IDC_COMBO2,66,71,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - CONTROL "Birthday:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,90,52,12 - COMBOBOX IDC_COMBO3,66,88,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - CONTROL "Language:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,106,52,12 - COMBOBOX IDC_COMBO4,66,105,84,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - CONTROL "Nickname:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,17,52,12 - EDITTEXT IDC_EDIT1,66,14,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP - CONTROL "Message:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | - WS_GROUP,9,36,52,12 - EDITTEXT IDC_EDIT2,66,33,82,14,ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP -END +LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL IDR_MAIN_ACCEL ACCELERATORS DISCARDABLE BEGIN @@ -1269,3 +1271,4 @@ BEGIN END ////////////////////////////////////////////////////////////////////////////// +