From edfb5bd1acef0ce9edf1a6120dd69087c164e2fd Mon Sep 17 00:00:00 2001 From: mtabachenko Date: Mon, 6 Oct 2008 12:01:47 +0000 Subject: [PATCH] winport: - new config input dialog; --- desmume/src/windows/resource.h | 33 ++++++++++++++---------- desmume/src/windows/resources.rc | 44 +++++++++++++++++--------------- 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index d926b338e..572074869 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -178,36 +178,41 @@ #define IDC_PROP1 909 #define IDC_OAM_BOX 910 #define IDC_SOUNDCORECB 1000 -#define IDC_EDIT3 1000 +#define IDC_EDIT03 1000 #define IDC_SOUNDBUFFERET 1001 -#define IDC_EDIT4 1001 +#define IDC_EDIT01 1001 #define IDC_SLVOLUME 1002 -#define IDC_EDIT5 1002 +#define IDC_EDIT05 1002 #define IDC_ROTATE0 1003 -#define IDC_EDIT6 1003 +#define IDC_EDIT08 1003 #define IDC_ROTATE90 1004 -#define IDC_EDIT7 1004 +#define IDC_EDIT11 1004 #define IDC_ROTATE180 1005 -#define IDC_EDIT8 1005 +#define IDC_EDIT07 1005 #define IDC_ROTATE270 1006 -#define IDC_EDIT9 1006 -#define IDC_EDIT10 1007 -#define IDC_EDIT11 1008 +#define IDC_EDIT12 1006 +#define IDC_EDIT06 1007 +#define IDC_EDIT09 1008 #define IDC_FORCERATIO 1009 -#define IDC_EDIT12 1009 +#define IDC_EDIT10 1009 #define IDC_WINDOW1X 1010 -#define IDC_EDIT13 1010 #define IDC_AUTO_UPDATE_SPIN 1010 +#define IDC_EDIT15 1010 #define IDC_WINDOW2X 1011 #define IDC_AUTO_UPDATE_SECS 1011 #define IDC_WINDOW3X 1012 #define IDC_REFRESH 1012 #define IDC_WINDOW4X 1013 +#define IDC_EDIT02 1013 +#define IDC_EDIT04 1014 +#define ID_CANCEL 1016 +#define IDSAVE 1017 #define IDM_FIRMSETTINGS 1100 #define IDD_FIRMSETTINGS 1101 #define IDC_EDIT1 1102 #define IDC_EDIT2 1103 -#define IDC_EDIT14 1104 +#define IDC_EDIT13 1104 +#define IDC_EDIT14 1105 #define IDD_MATRIX_VIEWER 1200 #define IDM_MATRIX_VIEWER 1200 #define IDC_MATRIX_VIEWER_COORD_GROUP 1201 @@ -334,8 +339,8 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 107 -#define _APS_NEXT_COMMAND_VALUE 40017 -#define _APS_NEXT_CONTROL_VALUE 1013 +#define _APS_NEXT_COMMAND_VALUE 40018 +#define _APS_NEXT_CONTROL_VALUE 1018 #define _APS_NEXT_SYMED_VALUE 112 #endif #endif diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index f33d8cc4b..d0973c627 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -17,7 +17,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) #ifdef _WIN32 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1252) +#pragma code_page(1251) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// @@ -27,6 +27,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDR_MAIN_ACCEL ACCELERATORS BEGIN + "N", ACCEL_N, VIRTKEY, NOINVERT VK_SPACE, ACCEL_SPACEBAR, VIRTKEY, NOINVERT VK_F1, IDM_STATE_LOAD_F1, VIRTKEY, NOINVERT VK_F10, IDM_STATE_LOAD_F10, VIRTKEY, NOINVERT @@ -48,7 +49,6 @@ BEGIN VK_F7, IDM_STATE_SAVE_F7, VIRTKEY, SHIFT, NOINVERT VK_F8, IDM_STATE_SAVE_F8, VIRTKEY, SHIFT, NOINVERT VK_F9, IDM_STATE_SAVE_F9, VIRTKEY, SHIFT, NOINVERT - "N", ACCEL_N, VIRTKEY, NOINVERT END #endif // Neutral resources @@ -1234,24 +1234,24 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTI CAPTION "Configure controls" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - EDITTEXT IDC_EDIT4,32,69,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT1,7,83,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT3,57,83,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT2,32,97,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT5,271,97,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT10,290,81,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT8,247,80,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT6,271,63,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT11,7,7,50,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT12,268,7,50,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT7,248,30,34,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT9,285,30,30,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT13,28,30,34,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED - EDITTEXT IDC_EDIT14,7,127,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED - DEFPUSHBUTTON "OK",IDOK,205,127,50,14 + EDITTEXT IDC_EDIT01,32,69,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN + EDITTEXT IDC_EDIT02,7,83,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT03,57,83,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT04,32,97,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT05,271,97,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT06,290,81,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT07,247,80,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT08,271,63,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT09,7,7,50,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT10,268,7,50,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT11,248,30,34,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT12,285,30,30,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT13,7,127,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + EDITTEXT IDC_EDIT14,95,127,26,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + EDITTEXT IDC_EDIT15,28,30,34,14,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED + PUSHBUTTON "OK",IDOK,205,127,50,14 PUSHBUTTON "Cancel",IDCANCEL,268,127,50,14 GROUPBOX "",IDC_STATIC,7,17,311,109 - CONTROL 102,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | WS_BORDER,92,30,149,86 CONTROL "",IDC_STATIC,"Static",SS_GRAYRECT,33,83,24,14 LTEXT "up",IDC_STATIC,41,59,9,8 LTEXT "left",IDC_STATIC,15,73,12,8 @@ -1265,8 +1265,10 @@ BEGIN LTEXT "R",IDC_STATIC,258,10,8,8 LTEXT "L",IDC_STATIC,60,10,8,8 LTEXT "right",IDC_STATIC,63,73,16,8 - LTEXT "power",IDC_STATIC,36,46,21,8 - LTEXT "open/close fold",IDC_STATIC,36,129,50,8 + LTEXT "power",IDC_STATIC,36,46,21,8,WS_DISABLED + LTEXT "open/close fold",IDC_STATIC,36,129,50,8,WS_DISABLED + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,95,41,141,77 + LTEXT "debug",IDC_STATIC,123,129,21,8,WS_DISABLED END IDD_DESASSEMBLEUR_VIEWER9 DIALOGEX 0, 0, 380, 186 @@ -1388,7 +1390,7 @@ BEGIN BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 318 - VERTGUIDE, 161 + VERTGUIDE, 162 TOPMARGIN, 7 BOTTOMMARGIN, 141 END