From b57dcc25b765635a38498b6a4562d731e1570012 Mon Sep 17 00:00:00 2001 From: Brandon Wright Date: Wed, 13 Feb 2019 16:47:38 -0600 Subject: [PATCH] win32: Finish tweaking dialog boxes. --- win32/CWaveOut.cpp | 2 +- win32/rsrc/snes9x.rc | 394 +++++++++++++++++++++++++------------------ 2 files changed, 230 insertions(+), 166 deletions(-) diff --git a/win32/CWaveOut.cpp b/win32/CWaveOut.cpp index de98db30..51bbb022 100644 --- a/win32/CWaveOut.cpp +++ b/win32/CWaveOut.cpp @@ -75,7 +75,7 @@ bool CWaveOut::SetupSound() void CWaveOut::SetVolume(double volume) { - uint32 volumeout = volume * 0xffff; + uint32 volumeout = (uint32) (volume * 0xffff); waveOutSetVolume(hWaveOut, volumeout + (volumeout << 16)); } diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc index 51d48044..9c5407e9 100644 --- a/win32/rsrc/snes9x.rc +++ b/win32/rsrc/snes9x.rc @@ -32,7 +32,7 @@ CAPTION "Sound Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "Sound Quality",IDC_STATIC,120,6,288,126,0,WS_EX_TRANSPARENT - DEFPUSHBUTTON "&OK",IDOK,318,138,42,14 + DEFPUSHBUTTON "&OK",IDOK,306,138,48,14 COMBOBOX IDC_DRIVER,180,36,106,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Sound Driver:",IDC_STATIC,126,36,51,12,SS_CENTERIMAGE COMBOBOX IDC_BUFLEN,180,72,106,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -43,7 +43,7 @@ BEGIN CONTROL "&Automatic Input Rate",IDC_AUTOMATICINPUTRATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,294,114,102,10 CONTROL "&Synchronize with sound core",IDC_SYNC_TO_SOUND_CPU, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,294,60,112,10 - PUSHBUTTON "&Cancel",IDCANCEL,366,138,42,14 + PUSHBUTTON "&Cancel",IDCANCEL,360,138,48,14 CONTROL "&Mute sound",IDC_MUTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,294,36,102,10 CONTROL "Frame Advance mu&te",IDC_FAMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,294,48,102,10 CONTROL "",IDC_INRATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,126,108,162,18 @@ -62,22 +62,22 @@ BEGIN LTEXT "Output Device:",IDC_STATIC,126,18,51,12,SS_CENTERIMAGE END -IDD_ROM_INFO DIALOGEX 0, 0, 233, 185 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +IDD_ROM_INFO DIALOGEX 0, 0, 234, 186 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU CAPTION "Rom Info" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,85,164,50,14 - EDITTEXT IDC_ROM_DATA,7,7,219,153,ES_MULTILINE | ES_READONLY + DEFPUSHBUTTON "OK",IDOK,180,166,48,14 + EDITTEXT IDC_ROM_DATA,6,6,222,154,ES_MULTILINE | ES_READONLY END -IDD_ABOUT DIALOGEX 0, 0, 236, 182 +IDD_ABOUT DIALOGEX 0, 0, 234, 180 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU CAPTION "APP - About Dialog" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,180,162,50,14 - EDITTEXT IDC_DISCLAIMER,6,6,222,150,ES_MULTILINE | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL,WS_EX_STATICEDGE + DEFPUSHBUTTON "OK",IDOK,180,160,48,14 + EDITTEXT IDC_DISCLAIMER,6,6,222,148,ES_MULTILINE | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL,WS_EX_STATICEDGE END IDD_EMU_SETTINGS DIALOGEX 0, 0, 342, 200 @@ -142,28 +142,28 @@ BEGIN LTEXT "Header:",IDC_STATIC_HEADER,256,198,54,8,NOT WS_GROUP END -IDD_NPOPTIONS DIALOGEX 0, 0, 187, 161 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION +IDD_NPOPTIONS DIALOGEX 0, 0, 204, 166 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION CAPTION "Netplay Options" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Port Settings",IDC_PORTNUMBLOCK,5,5,180,25,0,WS_EX_TRANSPARENT - RTEXT "Socket Port Number",IDC_LABEL_PORTNUM,10,15,85,10,SS_CENTERIMAGE - EDITTEXT IDC_PORTNUMBERA,100,15,25,12,ES_RIGHT | ES_AUTOHSCROLL - GROUPBOX "Client Settings",IDC_CLIENTSETTINGSBLOCK,5,35,180,40,0,WS_EX_TRANSPARENT - RTEXT "Ask Server to Pause when",IDC_LABEL_PAUSEINTERVAL,10,45,85,10,SS_CENTERIMAGE - EDITTEXT IDC_PAUSEINTERVAL,100,45,30,12,ES_RIGHT | ES_AUTOHSCROLL - CONTROL "Spin1",IDC_PAUSESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_TABSTOP,120,45,10,12 - LTEXT "frames behind",IDC_LABEL_PAUSEINTERVAL_TEXT,135,45,45,12,SS_CENTERIMAGE - RTEXT "Maximum Frame Rate Skip",IDC_LABEL_MAXSKIP,10,60,85,10,SS_CENTERIMAGE - EDITTEXT IDC_MAXSKIP,100,60,30,12,ES_RIGHT | ES_AUTOHSCROLL - CONTROL "Spin2",IDC_MAXSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_TABSTOP,120,60,10,12 - GROUPBOX "Server Settings",IDC_SERVERSETTINGSBLOCK,5,80,180,60,0,WS_EX_TRANSPARENT - CONTROL "Send ROM Image to Client on Connect",IDC_SENDROM,"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,10,105,173,15 - CONTROL "Act as Server",IDC_ACTASSERVER,"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,10,120,174,15 - DEFPUSHBUTTON "OK",IDOK,80,145,50,14 - PUSHBUTTON "Cancel",IDCANCEL,135,145,50,14 - CONTROL "Sync By Reset",IDC_SYNCBYRESET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,90,174,15 + GROUPBOX "Port Settings",IDC_PORTNUMBLOCK,6,6,186,25,0,WS_EX_TRANSPARENT + RTEXT "Socket Port Number",IDC_LABEL_PORTNUM,12,15,90,10,SS_CENTERIMAGE + EDITTEXT IDC_PORTNUMBERA,108,15,30,12,ES_RIGHT | ES_AUTOHSCROLL + GROUPBOX "Client Settings",IDC_CLIENTSETTINGSBLOCK,6,36,192,40,0,WS_EX_TRANSPARENT + RTEXT "Ask Server to Pause when",IDC_LABEL_PAUSEINTERVAL,12,46,90,10,SS_CENTERIMAGE + EDITTEXT IDC_PAUSEINTERVAL,108,45,30,12,ES_RIGHT | ES_AUTOHSCROLL + CONTROL "Spin1",IDC_PAUSESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_TABSTOP,128,45,10,12 + LTEXT "frames behind",IDC_LABEL_PAUSEINTERVAL_TEXT,144,45,48,12,SS_CENTERIMAGE + RTEXT "Maximum Frame Rate Skip",IDC_LABEL_MAXSKIP,12,60,90,10,SS_CENTERIMAGE + EDITTEXT IDC_MAXSKIP,108,60,30,12,ES_RIGHT | ES_AUTOHSCROLL + CONTROL "Spin2",IDC_MAXSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_TABSTOP,128,60,10,12 + GROUPBOX "Server Settings",IDC_SERVERSETTINGSBLOCK,6,80,192,60,0,WS_EX_TRANSPARENT + CONTROL "Send ROM Image to Client on Connect",IDC_SENDROM,"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,12,105,170,15 + CONTROL "Act as Server",IDC_ACTASSERVER,"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,12,120,170,15 + DEFPUSHBUTTON "OK",IDOK,96,146,48,14 + PUSHBUTTON "Cancel",IDCANCEL,150,146,48,14 + CONTROL "Sync By Reset",IDC_SYNCBYRESET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,172,15 END IDD_NEWDISPLAY DIALOGEX 0, 0, 348, 290 @@ -229,27 +229,27 @@ CAPTION "Cheat Entry and Editor" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "List1",IDC_CHEAT_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,6,294,120,WS_EX_CLIENTEDGE - DEFPUSHBUTTON "&Add",IDC_ADD_CHEAT,306,6,66,15,WS_DISABLED - PUSHBUTTON "&Delete",IDC_DELETE_CHEAT,306,60,66,15,WS_DISABLED - PUSHBUTTON "&Update",IDC_UPDATE_CHEAT,306,24,66,15,WS_DISABLED - PUSHBUTTON "C&lear",IDC_CLEAR_CHEATS,306,42,66,15 + DEFPUSHBUTTON "&Add",IDC_ADD_CHEAT,306,6,66,14,WS_DISABLED + PUSHBUTTON "&Delete",IDC_DELETE_CHEAT,306,60,66,14,WS_DISABLED + PUSHBUTTON "&Update",IDC_UPDATE_CHEAT,306,24,66,14,WS_DISABLED + PUSHBUTTON "C&lear",IDC_CLEAR_CHEATS,306,42,66,14 EDITTEXT IDC_CHEAT_CODE,84,132,288,15,ES_UPPERCASE | ES_AUTOHSCROLL EDITTEXT IDC_CHEAT_DESCRIPTION,84,150,288,15,ES_AUTOHSCROLL - PUSHBUTTON "&OK",IDOK,270,168,48,15 - PUSHBUTTON "&Cancel",IDCANCEL,324,168,48,15 + PUSHBUTTON "&OK",IDOK,270,169,48,14 + PUSHBUTTON "&Cancel",IDCANCEL,324,169,48,14 RTEXT "Enter Cheat Code:",IDC_LABEL_CHEAT_CODE,18,132,61,15,SS_CENTERIMAGE RTEXT "Cheat Description:",IDC_LABEL_CHEAT_DESCRIPTION,18,150,61,15,SS_CENTERIMAGE - PUSHBUTTON "&Search Database",IDC_SEARCH_DB,306,96,66,15 - PUSHBUTTON "&Remove All",IDC_DELETE_ALL,306,78,66,15 + PUSHBUTTON "&Search Database",IDC_SEARCH_DB,306,96,66,14 + PUSHBUTTON "&Remove All",IDC_DELETE_ALL,306,78,66,14 END -IDD_NETPLAYPROGRESS DIALOG 0, 0, 186, 61 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_NETPLAYPROGRESS DIALOGEX 0, 0, 186, 61 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Static",IDC_STATIC,5,0,160,20 - CONTROL "Progress1",IDC_NPPROGRESS,"msctls_progress32",WS_BORDER,5,30,160,25 + LTEXT "Static",IDC_STATIC,6,6,174,20 + CONTROL "Progress1",IDC_NPPROGRESS,"msctls_progress32",WS_BORDER,6,30,174,25 END IDD_INPUTCONFIG DIALOGEX 0, 0, 330, 152 @@ -300,75 +300,75 @@ BEGIN GROUPBOX "Buttons",IDC_STATIC,5,30,234,116,0,WS_EX_TRANSPARENT END -IDD_CHEAT_SEARCH DIALOGEX 0, 0, 272, 275 -STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +IDD_CHEAT_SEARCH DIALOGEX 0, 0, 276, 276 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU CAPTION "Cheat Search" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,161,253,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,218,253,50,14 - CONTROL "List1",IDC_ADDYS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,7,201,152,WS_EX_CLIENTEDGE - PUSHBUTTON "&Search",IDC_C_SEARCH,215,7,52,16 - PUSHBUTTON "&Add Cheat",IDC_C_ADD,215,29,52,16,WS_DISABLED - PUSHBUTTON "&Reset",IDC_C_RESET,215,51,52,16 - CONTROL "1 byte",IDC_1_BYTE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,212,172,42,11 - CONTROL "2 bytes",IDC_2_BYTE,"Button",BS_AUTORADIOBUTTON,212,185,42,11 - CONTROL "3 bytes",IDC_3_BYTE,"Button",BS_AUTORADIOBUTTON,212,198,42,11 - CONTROL "4 bytes",IDC_4_BYTE,"Button",BS_AUTORADIOBUTTON,212,211,42,11 - GROUPBOX "Data Size",IDC_STATIC,205,162,54,66,0,WS_EX_TRANSPARENT - GROUPBOX "Comparison Type",IDC_STATIC,7,162,114,86,0,WS_EX_TRANSPARENT - CONTROL "< (Less Than)",IDC_LESS_THAN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,170,90,11 - CONTROL "> (Greater Than)",IDC_GREATER_THAN,"Button",BS_AUTORADIOBUTTON,13,182,90,11 - CONTROL "<= (Less Than or Equal to)",IDC_LESS_THAN_EQUAL,"Button",BS_AUTORADIOBUTTON,13,194,106,11 + DEFPUSHBUTTON "&OK",IDOK,168,256,48,14 + PUSHBUTTON "&Cancel",IDCANCEL,222,256,48,14 + CONTROL "List1",IDC_ADDYS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,6,6,201,152,WS_EX_CLIENTEDGE + PUSHBUTTON "&Search",IDC_C_SEARCH,213,6,57,14 + PUSHBUTTON "&Add Cheat",IDC_C_ADD,213,26,57,14,WS_DISABLED + PUSHBUTTON "&Reset",IDC_C_RESET,213,46,57,14 + CONTROL "1 byte",IDC_1_BYTE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,223,172,42,11 + CONTROL "2 bytes",IDC_2_BYTE,"Button",BS_AUTORADIOBUTTON,223,185,42,11 + CONTROL "3 bytes",IDC_3_BYTE,"Button",BS_AUTORADIOBUTTON,223,198,42,11 + CONTROL "4 bytes",IDC_4_BYTE,"Button",BS_AUTORADIOBUTTON,223,211,42,11 + GROUPBOX "Data Size",IDC_STATIC,216,162,54,66,0,WS_EX_TRANSPARENT + GROUPBOX "Comparison Type",IDC_STATIC,7,162,121,87,0,WS_EX_TRANSPARENT + CONTROL "< (Less Than)",IDC_LESS_THAN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,172,90,11 + CONTROL "> (Greater Than)",IDC_GREATER_THAN,"Button",BS_AUTORADIOBUTTON,13,184,90,11 + CONTROL "<= (Less Than or Equal to)",IDC_LESS_THAN_EQUAL,"Button",BS_AUTORADIOBUTTON,13,196,106,11 CONTROL ">= (Greater than or Equal To)",IDC_GREATER_THAN_EQUAL, - "Button",BS_AUTORADIOBUTTON,13,206,105,11 - CONTROL "= (Equal To)",IDC_EQUAL,"Button",BS_AUTORADIOBUTTON,13,218,90,11 - CONTROL "!= (Not Equal To)",IDC_NOT_EQUAL,"Button",BS_AUTORADIOBUTTON,13,230,90,11 - GROUPBOX "Data Type",IDC_STATIC,125,206,75,43,0,WS_EX_TRANSPARENT - GROUPBOX "Compare To",IDC_STATIC,125,162,75,42,0,WS_EX_TRANSPARENT - CONTROL "Previous Value",IDC_PREV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,129,171,67,10 - CONTROL "Entered Value",IDC_ENTERED,"Button",BS_AUTORADIOBUTTON,129,181,67,10 - CONTROL "Entered Address",IDC_ENTEREDADDRESS,"Button",BS_AUTORADIOBUTTON,129,192,67,10 - CONTROL "Unsigned (>=0)",IDC_UNSIGNED,"Button",BS_AUTORADIOBUTTON | WS_GROUP,129,216,67,10 - CONTROL "Signed (+/-)",IDC_SIGNED,"Button",BS_AUTORADIOBUTTON,129,226,67,10 - CONTROL "Hexadecimal",IDC_HEX,"Button",BS_AUTORADIOBUTTON,129,236,67,10 - EDITTEXT IDC_VALUE_ENTER,72,253,83,12,ES_UPPERCASE | ES_AUTOHSCROLL | WS_DISABLED - RTEXT "Enter a Value:",IDC_ENTER_LABEL,7,253,54,12,SS_CENTERIMAGE | WS_DISABLED - PUSHBUTTON "&Watch",IDC_C_WATCH,215,91,52,16,WS_DISABLED - PUSHBUTTON "&Clear Watches",IDC_C_CLEARWATCH,215,108,52,16 - PUSHBUTTON "&Load Watches",IDC_C_LOADWATCH,215,125,52,16 - PUSHBUTTON "Sa&ve Watches",IDC_C_SAVEWATCH,215,142,52,16 + "Button",BS_AUTORADIOBUTTON,13,208,105,11 + CONTROL "= (Equal To)",IDC_EQUAL,"Button",BS_AUTORADIOBUTTON,13,220,90,11 + CONTROL "!= (Not Equal To)",IDC_NOT_EQUAL,"Button",BS_AUTORADIOBUTTON,13,232,90,11 + GROUPBOX "Data Type",IDC_STATIC,134,206,75,43,0,WS_EX_TRANSPARENT + GROUPBOX "Compare To",IDC_STATIC,134,162,75,42,0,WS_EX_TRANSPARENT + CONTROL "Previous Value",IDC_PREV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,138,171,67,10 + CONTROL "Entered Value",IDC_ENTERED,"Button",BS_AUTORADIOBUTTON,138,181,67,10 + CONTROL "Entered Address",IDC_ENTEREDADDRESS,"Button",BS_AUTORADIOBUTTON,138,192,67,10 + CONTROL "Unsigned (>=0)",IDC_UNSIGNED,"Button",BS_AUTORADIOBUTTON | WS_GROUP,138,216,67,10 + CONTROL "Signed (+/-)",IDC_SIGNED,"Button",BS_AUTORADIOBUTTON,138,226,67,10 + CONTROL "Hexadecimal",IDC_HEX,"Button",BS_AUTORADIOBUTTON,138,236,67,10 + EDITTEXT IDC_VALUE_ENTER,66,256,87,12,ES_UPPERCASE | ES_AUTOHSCROLL | WS_DISABLED + RTEXT "Enter a Value:",IDC_ENTER_LABEL,7,256,54,12,SS_CENTERIMAGE | WS_DISABLED + PUSHBUTTON "&Watch",IDC_C_WATCH,213,84,57,14,WS_DISABLED + PUSHBUTTON "&Clear Watches",IDC_C_CLEARWATCH,213,104,57,14 + PUSHBUTTON "&Load Watches",IDC_C_LOADWATCH,213,124,57,14 + PUSHBUTTON "Sa&ve Watches",IDC_C_SAVEWATCH,213,144,57,14 END -IDD_CHEAT_FROM_SEARCH DIALOG 0, 0, 187, 143 -STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +IDD_CHEAT_FROM_SEARCH DIALOGEX 0, 0, 184, 144 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU CAPTION "Cheat Details" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - PUSHBUTTON "&OK",IDOK,85,123,45,13 - PUSHBUTTON "&Cancel",IDCANCEL,135,123,45,13 - EDITTEXT IDC_NC_ADDRESS,79,7,101,12,ES_AUTOHSCROLL - EDITTEXT IDC_NC_CURRVAL,79,31,101,12,ES_AUTOHSCROLL - EDITTEXT IDC_NC_PREVVAL,79,55,101,12,ES_AUTOHSCROLL - EDITTEXT IDC_NC_NEWVAL,79,79,101,12,ES_AUTOHSCROLL - EDITTEXT IDC_NC_DESC,79,103,101,12,ES_AUTOHSCROLL - RTEXT "Address",IDC_STATIC,7,7,70,12,SS_CENTERIMAGE - RTEXT "Current Value",IDC_STATIC,7,31,70,12,SS_CENTERIMAGE - RTEXT "Previous Value",IDC_STATIC,7,55,70,12,SS_CENTERIMAGE - RTEXT "New Value",IDC_STATIC,7,79,70,12,SS_CENTERIMAGE - RTEXT "Description",IDC_STATIC,7,103,70,12,SS_CENTERIMAGE + PUSHBUTTON "&OK",IDOK,76,124,48,14 + PUSHBUTTON "&Cancel",IDCANCEL,130,124,48,14 + EDITTEXT IDC_NC_ADDRESS,76,7,101,12,ES_AUTOHSCROLL + EDITTEXT IDC_NC_CURRVAL,76,31,101,12,ES_AUTOHSCROLL + EDITTEXT IDC_NC_PREVVAL,76,55,101,12,ES_AUTOHSCROLL + EDITTEXT IDC_NC_NEWVAL,76,79,101,12,ES_AUTOHSCROLL + EDITTEXT IDC_NC_DESC,76,103,102,12,ES_AUTOHSCROLL + RTEXT "Address",IDC_STATIC,0,7,70,12,SS_CENTERIMAGE + RTEXT "Current Value",IDC_STATIC,0,31,70,12,SS_CENTERIMAGE + RTEXT "Previous Value",IDC_STATIC,0,55,70,12,SS_CENTERIMAGE + RTEXT "New Value",IDC_STATIC,0,79,70,12,SS_CENTERIMAGE + RTEXT "Description",IDC_STATIC,0,103,70,12,SS_CENTERIMAGE END -IDD_OPENMOVIE DIALOGEX 0, 0, 304, 166 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_OPENMOVIE DIALOGEX 0, 0, 304, 169 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Play Movie" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,187,149,50,14 - PUSHBUTTON "Cancel",IDCANCEL,246,149,50,14 - EDITTEXT IDC_MOVIE_PATH,7,18,230,13,ES_AUTOHSCROLL - LTEXT "Movie File",IDC_STATIC,7,7,33,8 - PUSHBUTTON "&Browse...",IDC_BROWSE_MOVIE,248,17,48,14 + DEFPUSHBUTTON "OK",IDOK,196,149,48,14 + PUSHBUTTON "Cancel",IDCANCEL,250,149,48,14 + EDITTEXT IDC_MOVIE_PATH,6,18,240,14,ES_AUTOHSCROLL + LTEXT "Movie File",IDC_STATIC,6,8,33,8 + PUSHBUTTON "&Browse...",IDC_BROWSE_MOVIE,250,18,48,14 LTEXT "Recording Date:",IDC_STATIC,15,55,53,8 LTEXT "Length:",IDC_STATIC,43,64,25,8 LTEXT "Frames:",IDC_STATIC,43,73,26,8 @@ -377,45 +377,45 @@ BEGIN LTEXT "LENGTH",IDC_MOVIE_LENGTH,71,64,81,8 LTEXT "FRAMES",IDC_MOVIE_FRAMES,71,73,81,8 LTEXT "RERECORD",IDC_MOVIE_RERECORD,71,82,81,8 - LTEXT "Author Info:",IDC_LABEL_MOVIEINFOBOX,30,123,38,8 - CONTROL "Open Read-Only",IDC_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,172,7,69,10 - LTEXT "Static",IDC_MOVIE_METADATA,70,123,226,21,WS_BORDER - GROUPBOX "Record Options",IDC_LABEL_STARTSETTINGS,204,54,95,41 - CONTROL "Record from now",IDC_RECORD_NOW,"Button",BS_AUTORADIOBUTTON | WS_DISABLED | WS_GROUP | WS_TABSTOP,208,76,70,10 - CONTROL "Record from reset",IDC_RECORD_RESET,"Button",BS_AUTORADIOBUTTON | WS_DISABLED | WS_TABSTOP,208,64,72,10 - CONTROL "Joypad 1",IDC_JOY1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,18,106,45,10 - CONTROL "Joypad 3",IDC_JOY3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,106,45,10 - CONTROL "Joypad 2",IDC_JOY2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,67,106,45,10 - CONTROL "Joypad 4",IDC_JOY4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,165,106,45,10 - CONTROL "Joypad 5",IDC_JOY5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,214,106,45,10 - GROUPBOX "Record Controllers",IDC_LABEL_CONTROLLERSETTINGS,12,95,272,25 - LTEXT "Movie's ROM: CRC32=Unknown, Name=Unknown",IDC_MOVIEROMINFO,8,35,1024,8 - LTEXT "Current ROM: CRC32=Unknown, Name=Unknown",IDC_CURRENTROMINFO,9,43,287,9 + RTEXT "Author Info:",IDC_LABEL_MOVIEINFOBOX,24,123,36,8 + CONTROL "Open Read-Only",IDC_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,172,6,69,10 + LTEXT "Static",IDC_MOVIE_METADATA,66,123,232,21,WS_BORDER + GROUPBOX "Record Options",IDC_LABEL_STARTSETTINGS,204,54,94,41 + CONTROL "Record from now",IDC_RECORD_NOW,"Button",BS_AUTORADIOBUTTON | WS_DISABLED | WS_GROUP | WS_TABSTOP,208,78,70,10 + CONTROL "Record from reset",IDC_RECORD_RESET,"Button",BS_AUTORADIOBUTTON | WS_DISABLED | WS_TABSTOP,208,65,72,10 + CONTROL "Joypad 1",IDC_JOY1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,18,105,45,10 + CONTROL "Joypad 3",IDC_JOY3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,105,45,10 + CONTROL "Joypad 2",IDC_JOY2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,67,105,45,10 + CONTROL "Joypad 4",IDC_JOY4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,165,105,45,10 + CONTROL "Joypad 5",IDC_JOY5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,214,105,45,10 + GROUPBOX "Record Controllers",IDC_LABEL_CONTROLLERSETTINGS,12,95,286,25 + LTEXT "Movie's ROM: CRC32=Unknown, Name=Unknown",IDC_MOVIEROMINFO,6,35,1024,8 + LTEXT "Current ROM: CRC32=Unknown, Name=Unknown",IDC_CURRENTROMINFO,6,43,287,9 LTEXT " ",IDC_PLAYWARN,10,149,167,15 END IDD_CREATEMOVIE DIALOGEX 0, 0, 303, 118 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Record Movie" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,187,96,50,14 - PUSHBUTTON "Cancel",IDCANCEL,246,96,50,14 - EDITTEXT IDC_MOVIE_PATH,7,18,230,13,ES_AUTOHSCROLL - LTEXT "Movie File",IDC_STATIC,7,7,33,8 - PUSHBUTTON "&Browse...",IDC_BROWSE_MOVIE,248,17,48,14 - GROUPBOX "Record Options",IDC_LABEL_STARTSETTINGS,7,50,77,61 - CONTROL "Record from now",IDC_RECORD_NOW,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,77,70,10 - CONTROL "Record from reset",IDC_RECORD_RESET,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,11,64,72,10 - CONTROL "Joypad 1",IDC_JOY1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,59,45,10 - CONTROL "Joypad 3",IDC_JOY3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,79,45,10 - CONTROL "Joypad 2",IDC_JOY2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,69,45,10 - CONTROL "Joypad 4",IDC_JOY4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,89,45,10 - CONTROL "Joypad 5",IDC_JOY5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,99,45,10 - GROUPBOX "Record Controllers",IDC_LABEL_CONTROLLERSETTINGS,97,50,69,61 - EDITTEXT IDC_MOVIE_METADATA,67,34,229,14,ES_AUTOHSCROLL - LTEXT "Author Info:",IDC_STATIC,18,37,43,8,0,WS_EX_RIGHT - CONTROL "Clear SRAM",IDC_CLEARSRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,95,70,10 + DEFPUSHBUTTON "OK",IDOK,195,98,48,14 + PUSHBUTTON "Cancel",IDCANCEL,249,98,48,14 + EDITTEXT IDC_MOVIE_PATH,6,12,237,14,ES_AUTOHSCROLL + LTEXT "Movie File",IDC_STATIC,6,2,36,8 + PUSHBUTTON "&Browse...",IDC_BROWSE_MOVIE,249,12,48,14 + GROUPBOX "Record Options",IDC_LABEL_STARTSETTINGS,6,51,84,61 + CONTROL "Record from now",IDC_RECORD_NOW,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,78,70,10 + CONTROL "Record from reset",IDC_RECORD_RESET,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,11,65,72,10 + CONTROL "Joypad 1",IDC_JOY1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,60,45,10 + CONTROL "Joypad 3",IDC_JOY3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,80,45,10 + CONTROL "Joypad 2",IDC_JOY2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,70,45,10 + CONTROL "Joypad 4",IDC_JOY4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,90,45,10 + CONTROL "Joypad 5",IDC_JOY5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,100,45,10 + GROUPBOX "Record Controllers",IDC_LABEL_CONTROLLERSETTINGS,97,51,69,61 + EDITTEXT IDC_MOVIE_METADATA,66,32,231,14,ES_AUTOHSCROLL + LTEXT "Author Info:",IDC_STATIC,6,34,54,8,0,WS_EX_RIGHT + CONTROL "Clear SRAM",IDC_CLEARSRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,96,70,10 END IDD_KEYCUSTOM DIALOGEX 0, 0, 408, 206 @@ -500,44 +500,44 @@ BEGIN RTEXT "Load #:",IDC_LABEL_UP25,300,162,30,12 CONTROL "",IDC_SLOTLOAD,"InputCustomHot",WS_TABSTOP,336,162,60,11,WS_EX_CLIENTEDGE LTEXT "Blue means the hotkey is already mapped. Pink means it conflicts with a game button. Red means it's reserved by Windows. A hotkey can be disabled using Escape.",IDC_LABEL_BLUE,192,186,78,12,NOT WS_VISIBLE - COMBOBOX IDC_HKCOMBO,12,12,60,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "",IDC_STATIC,6,6,180,186,0,WS_EX_TRANSPARENT + COMBOBOX IDC_HKCOMBO,6,6,60,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "",IDC_STATIC,6,18,180,174,0,WS_EX_TRANSPARENT GROUPBOX "Save States",IDC_STATIC,192,6,210,174,0,WS_EX_TRANSPARENT END -IDD_MULTICART DIALOGEX 0, 0, 407, 90 +IDD_MULTICART DIALOGEX 0, 0, 390, 90 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Open MultiCart" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,343,66,50,14 - PUSHBUTTON "Cancel",IDCANCEL,286,66,50,14 - EDITTEXT IDC_MULTICART_EDITA,44,7,226,14,ES_AUTOHSCROLL - PUSHBUTTON "Swap A and B",IDC_MULTICART_SWAP,7,69,58,14 - EDITTEXT IDC_MULTICART_EDITB,44,27,226,14,ES_AUTOHSCROLL - LTEXT "Slot A :",IDC_STATIC,10,9,31,8 - LTEXT "Slot B :",IDC_STATIC,10,29,31,8 - PUSHBUTTON "Clear",IDC_MULTICART_CLEARA,343,7,50,14 - PUSHBUTTON "Clear",IDC_MULTICART_CLEARB,343,27,50,14 - PUSHBUTTON "Browse...",IDC_MULTICART_BROWSEA,279,7,57,14 - PUSHBUTTON "Browse...",IDC_MULTICART_BROWSEB,279,27,57,14 - LTEXT "BIOS :",IDC_STATIC,11,50,26,8 - EDITTEXT IDC_MULTICART_BIOSEDIT,44,48,226,14,ES_AUTOHSCROLL | ES_READONLY - LTEXT "not found",IDC_MULTICART_BIOSNOTFOUND,280,50,54,8 + DEFPUSHBUTTON "OK",IDOK,282,70,48,14 + PUSHBUTTON "Cancel",IDCANCEL,336,70,48,14 + EDITTEXT IDC_MULTICART_EDITA,42,6,222,14,ES_AUTOHSCROLL + PUSHBUTTON "Swap A and B",IDC_MULTICART_SWAP,6,70,60,14 + EDITTEXT IDC_MULTICART_EDITB,42,24,222,14,ES_AUTOHSCROLL + RTEXT "Slot A:",IDC_STATIC,6,8,30,8 + RTEXT "Slot B:",IDC_STATIC,6,26,30,8 + PUSHBUTTON "Clear",IDC_MULTICART_CLEARA,330,6,54,14 + PUSHBUTTON "Clear",IDC_MULTICART_CLEARB,330,24,54,14 + PUSHBUTTON "Browse...",IDC_MULTICART_BROWSEA,270,6,54,14 + PUSHBUTTON "Browse...",IDC_MULTICART_BROWSEB,270,24,54,14 + RTEXT "BIOS:",IDC_STATIC,6,50,30,8 + EDITTEXT IDC_MULTICART_BIOSEDIT,42,48,222,14,ES_AUTOHSCROLL | ES_READONLY + LTEXT "not found",IDC_MULTICART_BIOSNOTFOUND,270,50,54,8 END -IDD_NETCONNECT DIALOGEX 0, 0, 227, 61 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION +IDD_NETCONNECT DIALOGEX 0, 0, 234, 60 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION CAPTION "Connect to Server" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,120,45,50,14 - PUSHBUTTON "Canccel",IDCANCEL,175,45,50,14 - RTEXT "Server Address",IDC_LABEL_SERVERADDY,5,5,50,14,SS_CENTERIMAGE - PUSHBUTTON "Clear History",IDC_CLEARHISTORY,175,5,50,14 - RTEXT "Port Number",IDC_LABEL_PORTNUM,5,25,50,14,SS_CENTERIMAGE + DEFPUSHBUTTON "&OK",IDOK,126,40,48,14 + PUSHBUTTON "Cancel",IDCANCEL,180,40,48,14 + RTEXT "Server Address",IDC_LABEL_SERVERADDY,0,5,54,14,SS_CENTERIMAGE + PUSHBUTTON "Clear History",IDC_CLEARHISTORY,178,6,50,14 + RTEXT "Port Number",IDC_LABEL_PORTNUM,6,25,48,14,SS_CENTERIMAGE EDITTEXT IDC_PORTNUMBER,60,25,25,14,ES_AUTOHSCROLL - COMBOBOX IDC_HOSTNAME,60,5,110,40,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HOSTNAME,60,7,112,40,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP END IDD_DIALOG_SHADER_PARAMS DIALOGEX 0, 0, 308, 206 @@ -557,9 +557,9 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Snes9x - Unable to Initialize XAudio2" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,220,71,50,14 + DEFPUSHBUTTON "OK",IDOK,223,72,48,14 CONTROL "Dummy",IDC_SYSLINK_DX,"SysLink",WS_TABSTOP,33,7,236,62 - ICON "",IDC_STATIC_ICON,7,7,21,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | WS_GROUP + ICON "",IDC_STATIC_ICON,7,7,20,20,SS_CENTERIMAGE | SS_REALSIZEIMAGE | WS_GROUP END @@ -582,17 +582,17 @@ BEGIN IDD_ROM_INFO, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 226 + RIGHTMARGIN, 227 TOPMARGIN, 7 - BOTTOMMARGIN, 178 + BOTTOMMARGIN, 179 END IDD_ABOUT, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 227 + RIGHTMARGIN, 225 TOPMARGIN, 7 - BOTTOMMARGIN, 173 + BOTTOMMARGIN, 171 END IDD_EMU_SETTINGS, DIALOG @@ -612,6 +612,8 @@ BEGIN IDD_NPOPTIONS, DIALOG BEGIN + RIGHTMARGIN, 199 + BOTTOMMARGIN, 165 END IDD_NEWDISPLAY, DIALOG @@ -650,16 +652,17 @@ BEGIN IDD_CHEAT_SEARCH, DIALOG BEGIN LEFTMARGIN, 7 + RIGHTMARGIN, 272 TOPMARGIN, 7 - BOTTOMMARGIN, 268 + BOTTOMMARGIN, 269 END IDD_CHEAT_FROM_SEARCH, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 180 + RIGHTMARGIN, 177 TOPMARGIN, 7 - BOTTOMMARGIN, 136 + BOTTOMMARGIN, 137 END IDD_OPENMOVIE, DIALOG @@ -667,7 +670,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 297 TOPMARGIN, 7 - BOTTOMMARGIN, 162 + BOTTOMMARGIN, 165 HORZGUIDE, 31 HORZGUIDE, 55 HORZGUIDE, 120 @@ -696,13 +699,14 @@ BEGIN IDD_MULTICART, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 400 + RIGHTMARGIN, 383 TOPMARGIN, 7 BOTTOMMARGIN, 83 END IDD_NETCONNECT, DIALOG BEGIN + RIGHTMARGIN, 233 END IDD_DIALOG_SHADER_PARAMS, DIALOG @@ -1070,6 +1074,66 @@ BEGIN 0 END +IDD_ABOUT AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_ROM_INFO AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CHEATER AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_DIALOG_XAUDIO2_INIT_ERROR AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CHEAT_FROM_SEARCH AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CHEAT_SEARCH AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CREATEMOVIE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_MULTICART AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_NETCONNECT AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPENMOVIE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_NETPLAYPROGRESS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_NPOPTIONS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + #endif // English (United States) resources /////////////////////////////////////////////////////////////////////////////