From 10e83f5859980a2ed67b8612a082fa9d18688498 Mon Sep 17 00:00:00 2001 From: Brandon Wright Date: Tue, 12 Feb 2019 17:59:19 -0600 Subject: [PATCH] win32: Clean up dialog boxes. --- win32/rsrc/resource.h | 3 +- win32/rsrc/snes9x.rc | 244 +++++++++++++++++++++++------------------- win32/wlanguage.h | 84 +++++++-------- 3 files changed, 176 insertions(+), 155 deletions(-) diff --git a/win32/rsrc/resource.h b/win32/rsrc/resource.h index faa61911..c95d5d85 100644 --- a/win32/rsrc/resource.h +++ b/win32/rsrc/resource.h @@ -274,6 +274,7 @@ #define IDC_HEIGHT_EXTEND 1198 #define IDC_LABEL_UP19 1198 #define IDC_ASPECT 1199 +#define IDC_LABEL_UP26 1199 #define IDC_MESSAGES_IN_IMAGE 1200 #define IDC_RECORD_NOW 1201 #define IDC_MESSAGES_SCALE 1201 @@ -535,7 +536,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 162 +#define _APS_NEXT_RESOURCE_VALUE 164 #define _APS_NEXT_COMMAND_VALUE 40178 #define _APS_NEXT_CONTROL_VALUE 3032 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc index bf3d3e02..54ff993e 100644 --- a/win32/rsrc/snes9x.rc +++ b/win32/rsrc/snes9x.rc @@ -71,13 +71,13 @@ BEGIN EDITTEXT IDC_ROM_DATA,7,7,219,153,ES_MULTILINE | ES_READONLY END -IDD_ABOUT DIALOGEX 0, 0, 232, 181 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +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,90,160,50,14 - EDITTEXT IDC_DISCLAIMER,7,7,218,148,ES_MULTILINE | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL,WS_EX_STATICEDGE + 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 END IDD_EMU_SETTINGS DIALOGEX 0, 0, 341, 198 @@ -85,8 +85,8 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPU CAPTION "APP - Emulator Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - EDITTEXT IDC_CUSTOM_FOLDER_FIELD,102,28,163,14,ES_AUTOHSCROLL - PUSHBUTTON "&Browse...",IDC_BROWSE,286,27,48,14 + EDITTEXT IDC_CUSTOM_FOLDER_FIELD,102,28,180,14,ES_AUTOHSCROLL + PUSHBUTTON "&Browse...",IDC_BROWSE,288,28,48,14 EDITTEXT IDC_AUTO_SAVE_DELAY,102,47,49,14,ES_AUTOHSCROLL | ES_NUMBER CONTROL "Spin2",IDC_SRAM_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,323,51,11,13 EDITTEXT IDC_MAX_SKIP,102,66,49,14,ES_AUTOHSCROLL | ES_NUMBER @@ -99,27 +99,27 @@ BEGIN CONTROL "",IDC_REWIND_GRANULARITY_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,304,131,11,13 EDITTEXT IDC_SFXSPEED,102,138,49,14,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_SFXSPEED_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,302,147,11,13 - CONTROL "Pause When Inactive",IDC_INACTIVE_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,155,100,12 - CONTROL "Custom ROM Open Dialog",IDC_CUSTOMROMOPEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,166,117,12 - CONTROL "Hi-Res AVI Recording",IDC_HIRESAVI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,177,117,12 - DEFPUSHBUTTON "&OK",IDOK,226,176,46,14 - PUSHBUTTON "&Cancel",IDCANCEL,288,176,46,14 - COMBOBOX IDC_DIRCOMBO,7,29,53,30,CBS_DROPDOWNLIST | WS_TABSTOP - RTEXT "Directory",IDC_LABEL_FREEZE,64,28,32,14,SS_CENTERIMAGE - RTEXT "Auto-Save S-RAM",IDC_LABEL_ASRAM,32,47,64,14,SS_CENTERIMAGE - RTEXT "Skip at most",IDC_LABEL_SMAX,51,66,45,14,SS_CENTERIMAGE - RTEXT "Skip rendering",IDC_LABEL_STURBO,43,85,51,14,SS_CENTERIMAGE - LTEXT "seconds after last change (0 disables auto-save)",IDC_LABEL_ASRAM_TEXT,157,47,161,14,SS_CENTERIMAGE - LTEXT "frames in auto-frame rate mode",IDC_LABEL_SMAX_TEXT,157,66,138,14,SS_CENTERIMAGE - LTEXT "frames in Turbo mode",IDC_LABEL_STURBO_TEXT,157,85,92,14,SS_CENTERIMAGE - LTEXT "Config file",IDC_STATIC,65,11,34,11 + CONTROL "Pause When Inactive",IDC_INACTIVE_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,156,96,8 + CONTROL "Custom ROM Open Dialog",IDC_CUSTOMROMOPEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,168,114,8 + CONTROL "Hi-Res AVI Recording",IDC_HIRESAVI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,180,114,8 + DEFPUSHBUTTON "&OK",IDOK,234,180,48,14 + PUSHBUTTON "&Cancel",IDCANCEL,288,180,48,14 + COMBOBOX IDC_DIRCOMBO,42,30,53,30,CBS_DROPDOWNLIST | WS_TABSTOP + RTEXT "Directory:",IDC_LABEL_FREEZE,0,30,38,12,SS_CENTERIMAGE + RTEXT "Auto-Save S-RAM",IDC_LABEL_ASRAM,12,47,84,14,SS_CENTERIMAGE + RTEXT "Skip at most",IDC_LABEL_SMAX,18,66,78,14,SS_CENTERIMAGE + RTEXT "Skip rendering",IDC_LABEL_STURBO,12,85,84,14,SS_CENTERIMAGE + LTEXT "seconds after last change (0 disables auto-save)",IDC_LABEL_ASRAM_TEXT,156,47,161,14,SS_CENTERIMAGE + LTEXT "frames in auto-frame rate mode",IDC_LABEL_SMAX_TEXT,156,66,138,14,SS_CENTERIMAGE + LTEXT "frames in Turbo mode",IDC_LABEL_STURBO_TEXT,156,85,92,14,SS_CENTERIMAGE + RTEXT "Config file:",IDC_STATIC,24,12,72,8 EDITTEXT IDC_CONFIG_NAME_BOX,102,9,49,14,ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER LTEXT "all of Snes9x's settings are stored in this file",IDC_STATIC,158,11,160,11 - RTEXT "Rewind Buffer",IDC_LABEL_RBUFFER,42,102,51,14,SS_CENTERIMAGE + RTEXT "Rewind buffer size:",IDC_LABEL_RBUFFER,12,102,84,14,SS_CENTERIMAGE LTEXT "MB (set to 0 to disable rewind support)",IDC_LABEL_RBUFFER_TEXT,156,102,131,14,SS_CENTERIMAGE - RTEXT "Rewind Granularity",IDC_LABEL_RGRANU,29,120,64,14,SS_CENTERIMAGE + RTEXT "Rewind granularity:",IDC_LABEL_RGRANU,12,120,84,14,SS_CENTERIMAGE LTEXT "frames",IDC_LABEL_GRANU_TEXT,156,120,131,14,SS_CENTERIMAGE - RTEXT "SuperFX Speed",IDC_LABEL_SFXSPEED,30,138,64,14,SS_CENTERIMAGE + RTEXT "SuperFX speed:",IDC_LABEL_SFXSPEED,18,138,78,14,SS_CENTERIMAGE LTEXT "%",IDC_LABEL_SFXSPEED_2,156,138,131,14,SS_CENTERIMAGE END @@ -252,8 +252,8 @@ BEGIN CONTROL "Progress1",IDC_NPPROGRESS,"msctls_progress32",WS_BORDER,5,30,160,25 END -IDD_INPUTCONFIG DIALOGEX 0, 0, 327, 150 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION +IDD_INPUTCONFIG DIALOGEX 0, 0, 330, 150 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION CAPTION " " FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN @@ -275,8 +275,8 @@ BEGIN CONTROL " ",IDC_UPRIGHT,"InputCustom",WS_DISABLED | WS_TABSTOP,161,104,71,12,WS_EX_CLIENTEDGE CONTROL " ",IDC_DWNRIGHT,"InputCustom",WS_DISABLED | WS_TABSTOP,161,117,71,12,WS_EX_CLIENTEDGE CONTROL " ",IDC_DWNLEFT,"InputCustom",WS_DISABLED | WS_TABSTOP,161,129,71,12,WS_EX_CLIENTEDGE - PUSHBUTTON "Cancel",IDCANCEL,242,127,39,14 - PUSHBUTTON "OK",IDOK,282,127,41,14 + PUSHBUTTON "Cancel",IDCANCEL,246,132,36,14 + PUSHBUTTON "OK",IDOK,288,132,36,14 LTEXT "Blue means the button is already mapped.\nPink means it conflicts with a custom hotkey.\nRed means it's reserved by Windows.\nButtons can be disabled using Escape.",IDC_LABEL_BLUE,166,0,157,32 RTEXT "UP",IDC_LABEL_UP,8,42,38,8 RTEXT "RIGHT",IDC_LABEL_RIGHT,6,81,41,8 @@ -295,7 +295,7 @@ BEGIN RTEXT "UP RIGHT",IDC_LABEL_UPRIGHT,122,107,36,8 RTEXT "DN LEFT",IDC_LABEL_DOWNLEFT,127,132,31,8 CONTROL IDB_PAD,IDC_STATIC,"Static",SS_BITMAP,243,39,80,74 - CONTROL "Allow Left+Rt/Up+Dn",IDC_ALLOWLEFTRIGHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,243,115,80,11 + CONTROL "Allow Left+Rt/Up+Dn",IDC_ALLOWLEFTRIGHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,243,115,87,11 GROUPBOX "Controller",IDC_STATIC,5,1,142,28,0,WS_EX_TRANSPARENT GROUPBOX "Buttons",IDC_STATIC,5,30,234,117,0,WS_EX_TRANSPARENT END @@ -418,89 +418,91 @@ BEGIN CONTROL "Clear SRAM",IDC_CLEARSRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,95,70,10 END -IDD_KEYCUSTOM DIALOGEX 0, 0, 349, 203 +IDD_KEYCUSTOM DIALOGEX 0, 0, 408, 204 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION CAPTION "Customize Special Keys" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - PUSHBUTTON "Cancel",IDCANCEL,66,182,50,14 - PUSHBUTTON "OK",IDOK,16,182,50,14 - RTEXT "speed +",IDC_LABEL_HK1,3,8,59,8 - RTEXT "frame advance",IDC_LABEL_HK4,3,47,59,8 - RTEXT "speed -",IDC_LABEL_HK2,3,21,59,8 - RTEXT "pause",IDC_LABEL_HK3,3,34,59,8 - RTEXT "skip +",IDC_LABEL_HK6,3,74,59,8 - RTEXT "movie frame count",IDC_LABEL_HK11,3,138,59,8 - RTEXT "superscope turbo",IDC_LABEL_HK8,3,98,59,8 - RTEXT "movie read-only",IDC_LABEL_HK12,3,150,59,8 - RTEXT "superscope pause",IDC_LABEL_HK9,3,111,59,8 - RTEXT "skip -",IDC_LABEL_HK7,3,85,59,8 - CONTROL "",IDC_HOTKEY1,"InputCustomHot",WS_TABSTOP,66,6,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY2,"InputCustomHot",WS_TABSTOP,66,19,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY3,"InputCustomHot",WS_TABSTOP,66,32,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY4,"InputCustomHot",WS_TABSTOP,66,45,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY5,"InputCustomHot",WS_TABSTOP,66,58,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY6,"InputCustomHot",WS_TABSTOP,66,71,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY7,"InputCustomHot",WS_TABSTOP,66,84,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY8,"InputCustomHot",WS_TABSTOP,66,97,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY9,"InputCustomHot",WS_TABSTOP,66,110,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY10,"InputCustomHot",WS_TABSTOP,66,123,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY11,"InputCustomHot",WS_TABSTOP,66,136,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY12,"InputCustomHot",WS_TABSTOP,66,149,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_HOTKEY13,"InputCustomHot",WS_TABSTOP,66,162,98,12,WS_EX_CLIENTEDGE - CONTROL "",IDC_SAVE1,"InputCustomHot",WS_TABSTOP,192,6,60,12,WS_EX_CLIENTEDGE - RTEXT "save1",IDC_LABEL_UP2,166,21,23,8 - CONTROL "",IDC_SAVE2,"InputCustomHot",WS_TABSTOP,192,19,60,12,WS_EX_CLIENTEDGE - RTEXT "save2",IDC_LABEL_UP3,166,34,23,8 - CONTROL "",IDC_SAVE3,"InputCustomHot",WS_TABSTOP,192,32,60,12,WS_EX_CLIENTEDGE - RTEXT "save3",IDC_LABEL_UP4,166,47,23,8 - CONTROL "",IDC_SAVE4,"InputCustomHot",WS_TABSTOP,192,45,60,12,WS_EX_CLIENTEDGE - RTEXT "save4",IDC_LABEL_UP5,166,58,23,8 - CONTROL "",IDC_SAVE5,"InputCustomHot",WS_TABSTOP,192,58,60,12,WS_EX_CLIENTEDGE - RTEXT "save5",IDC_LABEL_UP6,166,72,23,8 - CONTROL "",IDC_SAVE6,"InputCustomHot",WS_TABSTOP,192,71,60,12,WS_EX_CLIENTEDGE - RTEXT "save6",IDC_LABEL_UP7,166,85,23,8 - CONTROL "",IDC_SAVE7,"InputCustomHot",WS_TABSTOP,192,84,60,12,WS_EX_CLIENTEDGE - RTEXT "save7",IDC_LABEL_UP8,166,98,23,8 - CONTROL "",IDC_SAVE8,"InputCustomHot",WS_TABSTOP,192,97,60,12,WS_EX_CLIENTEDGE - RTEXT "save8",IDC_LABEL_UP9,166,112,23,8 - CONTROL "",IDC_SAVE9,"InputCustomHot",WS_TABSTOP,192,110,60,12,WS_EX_CLIENTEDGE - RTEXT "save9",IDC_LABEL_UP10,166,125,23,8 - CONTROL "",IDC_SAVE10,"InputCustomHot",WS_TABSTOP,192,123,60,12,WS_EX_CLIENTEDGE - RTEXT "save0",IDC_LABEL_UP11,166,8,23,8 - CONTROL "",IDC_SAVE11,"InputCustomHot",WS_TABSTOP,279,6,60,12,WS_EX_CLIENTEDGE - RTEXT "load1",IDC_LABEL_UP12,257,21,20,8 - CONTROL "",IDC_SAVE12,"InputCustomHot",WS_TABSTOP,279,19,60,12,WS_EX_CLIENTEDGE - RTEXT "load2",IDC_LABEL_UP13,257,34,20,8 - CONTROL "",IDC_SAVE13,"InputCustomHot",WS_TABSTOP,279,32,60,12,WS_EX_CLIENTEDGE - RTEXT "load3",IDC_LABEL_UP14,257,48,20,8 - CONTROL "",IDC_SAVE14,"InputCustomHot",WS_TABSTOP,279,45,60,12,WS_EX_CLIENTEDGE - RTEXT "load4",IDC_LABEL_UP15,257,61,20,8 - CONTROL "",IDC_SAVE15,"InputCustomHot",WS_TABSTOP,279,58,60,12,WS_EX_CLIENTEDGE - RTEXT "load5",IDC_LABEL_UP16,257,72,20,8 - CONTROL "",IDC_SAVE16,"InputCustomHot",WS_TABSTOP,279,71,60,12,WS_EX_CLIENTEDGE - RTEXT "load6",IDC_LABEL_UP17,257,85,20,8 - CONTROL "",IDC_SAVE17,"InputCustomHot",WS_TABSTOP,279,84,60,12,WS_EX_CLIENTEDGE - RTEXT "load7",IDC_LABEL_UP18,257,98,20,8 - CONTROL "",IDC_SAVE18,"InputCustomHot",WS_TABSTOP,279,97,60,12,WS_EX_CLIENTEDGE - RTEXT "load8",IDC_LABEL_UP19,257,111,20,8 - CONTROL "",IDC_SAVE19,"InputCustomHot",WS_TABSTOP,279,110,60,12,WS_EX_CLIENTEDGE - RTEXT "load9",IDC_LABEL_UP20,257,125,20,8 - CONTROL "",IDC_SAVE20,"InputCustomHot",WS_TABSTOP,279,123,60,12,WS_EX_CLIENTEDGE - RTEXT "load0",IDC_LABEL_UP21,257,8,20,8 - RTEXT "fast forward",IDC_LABEL_HK5,3,61,59,8 - RTEXT "show pressed keys",IDC_LABEL_HK10,3,125,59,8 - RTEXT "save screenshot",IDC_LABEL_HK13,3,163,59,8 - RTEXT "slot-",IDC_LABEL_UP22,166,138,23,8 - CONTROL "",IDC_SLOTMINUS,"InputCustomHot",WS_TABSTOP,192,136,60,12,WS_EX_CLIENTEDGE - RTEXT "slot+",IDC_LABEL_UP23,257,138,20,8 - CONTROL "",IDC_SLOTPLUS,"InputCustomHot",WS_TABSTOP,279,136,60,12,WS_EX_CLIENTEDGE - RTEXT "save#",IDC_LABEL_UP24,166,151,23,8 - CONTROL "",IDC_SLOTSAVE,"InputCustomHot",WS_TABSTOP,192,149,60,12,WS_EX_CLIENTEDGE - RTEXT "load#",IDC_LABEL_UP25,257,151,20,8 - CONTROL "",IDC_SLOTLOAD,"InputCustomHot",WS_TABSTOP,279,149,60,12,WS_EX_CLIENTEDGE - LTEXT "Blue means the hotkey is already mapped.\nPink means it conflicts with a game button.\nRed means it's reserved by Windows.\nA hotkey can be disabled using Escape.",IDC_LABEL_BLUE,208,164,136,32 - COMBOBOX IDC_HKCOMBO,134,183,60,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Cancel",IDCANCEL,354,186,48,14 + PUSHBUTTON "OK",IDOK,300,186,48,14 + RTEXT "Speed +:",IDC_LABEL_HK1,12,30,72,12 + RTEXT "Frame advance:",IDC_LABEL_HK4,12,66,72,12 + RTEXT "Speed -:",IDC_LABEL_HK2,12,42,72,12 + RTEXT "Pause:",IDC_LABEL_HK3,12,54,72,12 + RTEXT "Frameskip +:",IDC_LABEL_HK6,12,90,72,12 + RTEXT "Movie frame count:",IDC_LABEL_HK11,12,150,72,12 + RTEXT "SuperScope turbo:",IDC_LABEL_HK8,12,114,72,12 + RTEXT "Movie read-only:",IDC_LABEL_HK12,12,162,72,12 + RTEXT "SuperScope pause:",IDC_LABEL_HK9,12,126,72,12 + RTEXT "Frameskip -:",IDC_LABEL_HK7,12,102,72,12 + CONTROL "",IDC_HOTKEY1,"InputCustomHot",WS_TABSTOP,90,30,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY2,"InputCustomHot",WS_TABSTOP,90,42,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY3,"InputCustomHot",WS_TABSTOP,90,54,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY4,"InputCustomHot",WS_TABSTOP,90,66,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY5,"InputCustomHot",WS_TABSTOP,90,78,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY6,"InputCustomHot",WS_TABSTOP,90,90,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY7,"InputCustomHot",WS_TABSTOP,90,102,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY8,"InputCustomHot",WS_TABSTOP,90,114,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY9,"InputCustomHot",WS_TABSTOP,90,126,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY10,"InputCustomHot",WS_TABSTOP,90,138,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY11,"InputCustomHot",WS_TABSTOP,90,150,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY12,"InputCustomHot",WS_TABSTOP,90,162,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_HOTKEY13,"InputCustomHot",WS_TABSTOP,90,174,90,11,WS_EX_CLIENTEDGE + CONTROL "",IDC_SAVE1,"InputCustomHot",WS_TABSTOP,234,18,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 1:",IDC_LABEL_UP2,198,30,30,12 + CONTROL "",IDC_SAVE2,"InputCustomHot",WS_TABSTOP,234,30,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 2:",IDC_LABEL_UP3,198,42,30,12 + CONTROL "",IDC_SAVE3,"InputCustomHot",WS_TABSTOP,234,42,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 3:",IDC_LABEL_UP4,198,54,30,12 + CONTROL "",IDC_SAVE4,"InputCustomHot",WS_TABSTOP,234,54,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 4:",IDC_LABEL_UP5,198,66,30,12 + CONTROL "",IDC_SAVE5,"InputCustomHot",WS_TABSTOP,234,66,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 5:",IDC_LABEL_UP6,198,78,30,12 + CONTROL "",IDC_SAVE6,"InputCustomHot",WS_TABSTOP,234,78,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 6:",IDC_LABEL_UP7,198,90,30,12 + CONTROL "",IDC_SAVE7,"InputCustomHot",WS_TABSTOP,234,90,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 7:",IDC_LABEL_UP8,198,102,30,12 + CONTROL "",IDC_SAVE8,"InputCustomHot",WS_TABSTOP,234,102,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 8:",IDC_LABEL_UP9,198,114,30,12 + CONTROL "",IDC_SAVE9,"InputCustomHot",WS_TABSTOP,234,114,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 9:",IDC_LABEL_UP10,198,126,30,12 + CONTROL "",IDC_SAVE10,"InputCustomHot",WS_TABSTOP,234,126,60,11,WS_EX_CLIENTEDGE + RTEXT "Save 0:",IDC_LABEL_UP11,198,18,30,12 + CONTROL "",IDC_SAVE11,"InputCustomHot",WS_TABSTOP,336,18,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 1:",IDC_LABEL_UP12,300,30,30,12 + CONTROL "",IDC_SAVE12,"InputCustomHot",WS_TABSTOP,336,30,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 2:",IDC_LABEL_UP13,300,42,30,12 + CONTROL "",IDC_SAVE13,"InputCustomHot",WS_TABSTOP,336,42,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 3:",IDC_LABEL_UP14,300,54,30,12 + CONTROL "",IDC_SAVE14,"InputCustomHot",WS_TABSTOP,336,54,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 4:",IDC_LABEL_UP15,300,66,30,12 + CONTROL "",IDC_SAVE15,"InputCustomHot",WS_TABSTOP,336,66,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 5:",IDC_LABEL_UP16,300,78,30,12 + CONTROL "",IDC_SAVE16,"InputCustomHot",WS_TABSTOP,336,78,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 6:",IDC_LABEL_UP17,300,90,30,12 + CONTROL "",IDC_SAVE17,"InputCustomHot",WS_TABSTOP,336,90,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 7:",IDC_LABEL_UP18,300,102,30,12 + CONTROL "",IDC_SAVE18,"InputCustomHot",WS_TABSTOP,336,102,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 8:",IDC_LABEL_UP19,300,114,30,12 + CONTROL "",IDC_SAVE19,"InputCustomHot",WS_TABSTOP,336,114,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 9:",IDC_LABEL_UP20,300,126,30,12 + CONTROL "",IDC_SAVE20,"InputCustomHot",WS_TABSTOP,336,126,60,11,WS_EX_CLIENTEDGE + RTEXT "Load 0:",IDC_LABEL_UP21,300,18,30,12 + RTEXT "Fast-forward:",IDC_LABEL_HK5,12,78,72,12 + RTEXT "Show pressed keys:",IDC_LABEL_HK10,12,138,72,12 + RTEXT "Save screenshot:",IDC_LABEL_HK13,12,174,72,12 + RTEXT "Slot -:",IDC_LABEL_UP22,198,150,30,12 + CONTROL "",IDC_SLOTMINUS,"InputCustomHot",WS_TABSTOP,234,150,60,11,WS_EX_CLIENTEDGE + RTEXT "Slot +:",IDC_LABEL_UP23,300,150,30,12 + CONTROL "",IDC_SLOTPLUS,"InputCustomHot",WS_TABSTOP,336,150,60,11,WS_EX_CLIENTEDGE + RTEXT "Save #:",IDC_LABEL_UP24,198,162,30,12 + CONTROL "",IDC_SLOTSAVE,"InputCustomHot",WS_TABSTOP,234,162,60,11,WS_EX_CLIENTEDGE + 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 + GROUPBOX "Save States",IDC_STATIC,192,6,210,174,0,WS_EX_TRANSPARENT END IDD_MULTICART DIALOGEX 0, 0, 407, 90 @@ -588,9 +590,9 @@ BEGIN IDD_ABOUT, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 225 + RIGHTMARGIN, 227 TOPMARGIN, 7 - BOTTOMMARGIN, 174 + BOTTOMMARGIN, 173 END IDD_EMU_SETTINGS, DIALOG @@ -608,6 +610,10 @@ BEGIN BOTTOMMARGIN, 221 END + IDD_NPOPTIONS, DIALOG + BEGIN + END + IDD_NEWDISPLAY, DIALOG BEGIN LEFTMARGIN, 7 @@ -634,7 +640,7 @@ BEGIN IDD_INPUTCONFIG, DIALOG BEGIN LEFTMARGIN, 1 - RIGHTMARGIN, 323 + RIGHTMARGIN, 326 VERTGUIDE, 77 VERTGUIDE, 92 BOTTOMMARGIN, 141 @@ -681,10 +687,10 @@ BEGIN IDD_KEYCUSTOM, DIALOG BEGIN - RIGHTMARGIN, 346 + RIGHTMARGIN, 405 VERTGUIDE, 72 VERTGUIDE, 92 - BOTTOMMARGIN, 197 + BOTTOMMARGIN, 198 END IDD_MULTICART, DIALOG @@ -695,6 +701,10 @@ BEGIN BOTTOMMARGIN, 83 END + IDD_NETCONNECT, DIALOG + BEGIN + END + IDD_DIALOG_SHADER_PARAMS, DIALOG BEGIN LEFTMARGIN, 7 @@ -759,6 +769,16 @@ BEGIN 0 END +IDD_INPUTCONFIG AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_ABOUT AFX_DIALOG_LAYOUT +BEGIN + 0 +END + ///////////////////////////////////////////////////////////////////////////// // diff --git a/win32/wlanguage.h b/win32/wlanguage.h index 799057ef..b1573e97 100644 --- a/win32/wlanguage.h +++ b/win32/wlanguage.h @@ -78,48 +78,48 @@ Nintendo is a trade mark.") #define HOTKEYS_ALT_MOD "Alt + " #define HOTKEYS_LABEL_BLUE TEXT("Blue means the hotkey is already mapped.\nPink means it conflicts with a game button.\nRed means it's reserved by Windows.\nA hotkey can be disabled using Escape.") #define HOTKEYS_HKCOMBO TEXT("Page %d") -#define HOTKEYS_LABEL_1_1 TEXT("speed +") -#define HOTKEYS_LABEL_1_2 TEXT("speed -") -#define HOTKEYS_LABEL_1_3 TEXT("pause") -#define HOTKEYS_LABEL_1_4 TEXT("frame advance") -#define HOTKEYS_LABEL_1_5 TEXT("fast forward") -#define HOTKEYS_LABEL_1_6 TEXT("skip +") -#define HOTKEYS_LABEL_1_7 TEXT("skip -") -#define HOTKEYS_LABEL_1_8 TEXT("superscope turbo") -#define HOTKEYS_LABEL_1_9 TEXT("superscope pause") -#define HOTKEYS_LABEL_1_10 TEXT("show pressed keys") -#define HOTKEYS_LABEL_1_11 TEXT("movie frame count") -#define HOTKEYS_LABEL_1_12 TEXT("movie read-only") -#define HOTKEYS_LABEL_1_13 TEXT("save screenshot") -#define HOTKEYS_LABEL_2_1 TEXT("Graphics Layer 1") -#define HOTKEYS_LABEL_2_2 TEXT("Graphics Layer 2") -#define HOTKEYS_LABEL_2_3 TEXT("Graphics Layer 3") -#define HOTKEYS_LABEL_2_4 TEXT("Graphics Layer 4") -#define HOTKEYS_LABEL_2_5 TEXT("Sprites Layer") -#define HOTKEYS_LABEL_2_6 TEXT("Clipping Windows") -#define HOTKEYS_LABEL_2_7 TEXT("Transparency") -#define HOTKEYS_LABEL_2_8 TEXT("fast forward toggle") -#define HOTKEYS_LABEL_2_9 TEXT("Rewind") -#define HOTKEYS_LABEL_2_10 TEXT("Switch Controllers") -#define HOTKEYS_LABEL_2_11 TEXT("Joypad Swap") -#define HOTKEYS_LABEL_2_12 TEXT("Reset Game") -#define HOTKEYS_LABEL_2_13 TEXT("Toggle Cheats") -#define HOTKEYS_LABEL_3_1 TEXT("Turbo A mode") -#define HOTKEYS_LABEL_3_2 TEXT("Turbo B mode") -#define HOTKEYS_LABEL_3_3 TEXT("Turbo Y mode") -#define HOTKEYS_LABEL_3_4 TEXT("Turbo X mode") -#define HOTKEYS_LABEL_3_5 TEXT("Turbo L mode") -#define HOTKEYS_LABEL_3_6 TEXT("Turbo R mode") -#define HOTKEYS_LABEL_3_7 TEXT("Turbo Start mode") -#define HOTKEYS_LABEL_3_8 TEXT("Turbo Select mode") -#define HOTKEYS_LABEL_3_9 TEXT("Turbo Left mode") -#define HOTKEYS_LABEL_3_10 TEXT("Turbo Up mode") -#define HOTKEYS_LABEL_3_11 TEXT("Turbo Right mode") -#define HOTKEYS_LABEL_3_12 TEXT("Turbo Down mode") -#define HOTKEYS_LABEL_3_13 TEXT("Toggle Mute") -#define HOTKEYS_LABEL_4_11 TEXT("Save To File") -#define HOTKEYS_LABEL_4_12 TEXT("Load From File") -#define HOTKEYS_LABEL_4_13 TEXT("Quit Snes9x") +#define HOTKEYS_LABEL_1_1 TEXT("Speed +:") +#define HOTKEYS_LABEL_1_2 TEXT("Speed -:") +#define HOTKEYS_LABEL_1_3 TEXT("Pause:") +#define HOTKEYS_LABEL_1_4 TEXT("Frame advance:") +#define HOTKEYS_LABEL_1_5 TEXT("Fast forward:") +#define HOTKEYS_LABEL_1_6 TEXT("Skip frames +:") +#define HOTKEYS_LABEL_1_7 TEXT("Skip frames -:") +#define HOTKEYS_LABEL_1_8 TEXT("SuperScope turbo:") +#define HOTKEYS_LABEL_1_9 TEXT("SuperScope pause:") +#define HOTKEYS_LABEL_1_10 TEXT("Show pressed keys:") +#define HOTKEYS_LABEL_1_11 TEXT("Movie frame count:") +#define HOTKEYS_LABEL_1_12 TEXT("Movie read-only:") +#define HOTKEYS_LABEL_1_13 TEXT("Save screenshot") +#define HOTKEYS_LABEL_2_1 TEXT("Graphics layer 1:") +#define HOTKEYS_LABEL_2_2 TEXT("Graphics layer 2:") +#define HOTKEYS_LABEL_2_3 TEXT("Graphics layer 3:") +#define HOTKEYS_LABEL_2_4 TEXT("Graphics layer 4:") +#define HOTKEYS_LABEL_2_5 TEXT("Sprites layer:") +#define HOTKEYS_LABEL_2_6 TEXT("Clipping Windows:") +#define HOTKEYS_LABEL_2_7 TEXT("Transparency:") +#define HOTKEYS_LABEL_2_8 TEXT("Fast-forward toggle:") +#define HOTKEYS_LABEL_2_9 TEXT("Rewind:") +#define HOTKEYS_LABEL_2_10 TEXT("Switch controllers:") +#define HOTKEYS_LABEL_2_11 TEXT("Joypad swap:") +#define HOTKEYS_LABEL_2_12 TEXT("Reset game:") +#define HOTKEYS_LABEL_2_13 TEXT("Toggle cheats:") +#define HOTKEYS_LABEL_3_1 TEXT("Turbo A mode:") +#define HOTKEYS_LABEL_3_2 TEXT("Turbo B mode:") +#define HOTKEYS_LABEL_3_3 TEXT("Turbo Y mode:") +#define HOTKEYS_LABEL_3_4 TEXT("Turbo X mode:") +#define HOTKEYS_LABEL_3_5 TEXT("Turbo L mode:") +#define HOTKEYS_LABEL_3_6 TEXT("Turbo R mode:") +#define HOTKEYS_LABEL_3_7 TEXT("Turbo Start mode:") +#define HOTKEYS_LABEL_3_8 TEXT("Turbo Select mode:") +#define HOTKEYS_LABEL_3_9 TEXT("Turbo Left mode:") +#define HOTKEYS_LABEL_3_10 TEXT("Turbo Up mode:") +#define HOTKEYS_LABEL_3_11 TEXT("Turbo Right mode:") +#define HOTKEYS_LABEL_3_12 TEXT("Turbo Down mode:") +#define HOTKEYS_LABEL_3_13 TEXT("Toggle mute:") +#define HOTKEYS_LABEL_4_11 TEXT("Save to file:") +#define HOTKEYS_LABEL_4_12 TEXT("Load from file:") +#define HOTKEYS_LABEL_4_13 TEXT("Quit Snes9x:") // gaming buttons and axes #define GAMEDEVICE_JOYNUMPREFIX "(J%x)" // don't change this