diff --git a/src/burner/platform/win32/app.rc b/src/burner/platform/win32/app.rc index 9f9bbcd5b..5157fb51c 100644 --- a/src/burner/platform/win32/app.rc +++ b/src/burner/platform/win32/app.rc @@ -60,25 +60,25 @@ BEGIN CONTROL BMP_SPLASH,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,1,1,9999,9999 END -IDD_INPD DIALOGEX 0, 0, 250, 244 +IDD_INPD DIALOGEX 0, 0, 283, 244 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Map Game Inputs" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDCANCEL,195,225,50,14 - GROUPBOX "", IDC_STATIC, 3, 0, 244, 220 - CTEXT "Double-click an input to change its mapping",IDC_STATIC,7,7,232,15,SS_CENTERIMAGE - CONTROL "List1",IDC_INPD_LIST,"SysListView32",LVS_REPORT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 24, 232, 128 + DEFPUSHBUTTON "OK",IDCANCEL,228,225,50,14 + GROUPBOX "", IDC_STATIC, 3, 0, 277, 220 + CTEXT "Double-click an input to change its mapping",IDC_STATIC,7,7,265,15,SS_CENTERIMAGE + CONTROL "List1",IDC_INPD_LIST,"SysListView32",LVS_REPORT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 24, 265, 128 - CONTROL "", IDC_STATIC, "Static", SS_SUNKEN, 9, 156, 232, 58 - CTEXT "Make selection in all three drop-down boxes, click apropriate button",IDC_STATIC,11,159,228,15,SS_CENTERIMAGE - COMBOBOX IDC_INPD_GI,15,177,48,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_INPD_PCI,68,177,81,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_INPD_ANALOG,154,177,81,48,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_STATIC, "Static", SS_SUNKEN, 9, 156, 265, 58 + CTEXT "Make selection in all three drop-down boxes, click apropriate button",IDC_STATIC,11,159,261,15,SS_CENTERIMAGE + COMBOBOX IDC_INPD_GI,15,177,81,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_INPD_PCI,101,177,81,128,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_INPD_ANALOG,187,177,81,48,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP // PUSHBUTTON "Macro...",IDC_INPD_NEWMACRO,15,194,52,14 - PUSHBUTTON "Save preset",IDC_INPD_SAVE_AS_PRESET,71,194,52,14 - PUSHBUTTON "Make default",IDC_INPD_DEFAULT,127,194,52,14 - PUSHBUTTON "Use preset",IDC_INPD_USE,183,194,52,14 + PUSHBUTTON "Save preset",IDC_INPD_SAVE_AS_PRESET,15,194,81,14 + PUSHBUTTON "Make default",IDC_INPD_DEFAULT,101,194,81,14 + PUSHBUTTON "Use preset",IDC_INPD_USE,187,194,81,14 END IDD_INPS DIALOGEX 0, 0, 195, 64 @@ -249,46 +249,34 @@ BEGIN CONTROL "Scan ROMs",IDRESCAN,"Button",WS_TABSTOP,262,309,68,14 CONTROL "Cancel",IDCANCEL,"Button",WS_TABSTOP,372,340,58,14 CONTROL "Play",IDOK,"Button",WS_TABSTOP,435,340,58,14 - GROUPBOX "IPS",IDC_SEL_IPSGROUP,4,331,144,27 - CONTROL "Apply Patches",IDC_SEL_APPLYIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,343,60,8 - CONTROL "IPS Manager",IDC_SEL_IPSMANAGER,"Button",WS_TABSTOP,75,340,68,14 - GROUPBOX "Search",IDC_SEL_SEARCHGROUP,150,331,184,27 - EDITTEXT IDC_SEL_SEARCH,155,340,174,12,ES_AUTOHSCROLL | WS_TABSTOP + GROUPBOX "IPS",IDC_SEL_IPSGROUP,4,331,174,27 + CONTROL "Apply Patches",IDC_SEL_APPLYIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,343,90,8 + CONTROL "IPS Manager",IDC_SEL_IPSMANAGER,"Button",WS_TABSTOP,95,340,78,14 + GROUPBOX "Search",IDC_SEL_SEARCHGROUP,180,331,154,27 + EDITTEXT IDC_SEL_SEARCH,185,340,140,12,ES_AUTOHSCROLL | WS_TABSTOP END -IDD_CAPTURE DIALOGEX DISCARDABLE 0, 0, 227, 122 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_CAPTURE DIALOGEX 0, 0, 270, 90 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Shots Factory" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Capture",IDCAPTURE,76,101,50,14 - PUSHBUTTON "&Done",IDOK,128,101,50,14 - PUSHBUTTON "&Advance Frame",IDC_ADVANCE,17,101,57,14 - CONTROL "All Sprites",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,17,17,47,10 - CONTROL "Layer &2",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,17,29,39,10 - CONTROL "Layer &3",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,17,41,39,10 - CONTROL "Layer &4",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,17,53,39,10 - GROUPBOX "Show",IDC_STATIC,7,7,213,109 - CONTROL "Sprite Priority 1",IDC_SPRITE1,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,77,17,63,10 - CONTROL "Sprite Priority 2",IDC_SPRITE2,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,77,29,63,10 - CONTROL "Sprite Priority 4",IDC_SPRITE4,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,77,53,63,10 - CONTROL "Sprite Priority 3",IDC_SPRITE3,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,77,41,63,10 - CONTROL "Sprite Priority 5",IDC_SPRITE5,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,151,17,63,10 - CONTROL "Sprite Priority 6",IDC_SPRITE6,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,151,29,63,10 - CONTROL "Sprite Priority 7",IDC_SPRITE7,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,151,41,63,10 - CONTROL "Sprite Priority 8",IDC_SPRITE8,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,151,53,63,10 + DEFPUSHBUTTON "&Capture",IDCAPTURE,125,72,70,14 + PUSHBUTTON "OK",IDOK,197,72,70,14 + PUSHBUTTON "&Advance Frame",IDC_ADVANCE,54,72,70,14 + CONTROL "All Sprites",IDC_LAYER1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,17,80,10 + CONTROL "Layer &2",IDC_LAYER2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,29,80,10 + CONTROL "Layer &3",IDC_LAYER3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,41,80,10 + CONTROL "Layer &4",IDC_LAYER4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,53,80,10 + GROUPBOX "Show",IDC_SHOW,5,7,260,62 + CONTROL "Sprite Priority 1",IDC_SPRITE1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,17,80,10 + CONTROL "Sprite Priority 2",IDC_SPRITE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,29,80,10 + CONTROL "Sprite Priority 3",IDC_SPRITE3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,41,80,10 + CONTROL "Sprite Priority 4",IDC_SPRITE4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,53,80,10 + CONTROL "Sprite Priority 5",IDC_SPRITE5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,17,80,10 + CONTROL "Sprite Priority 6",IDC_SPRITE6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,29,80,10 + CONTROL "Sprite Priority 7",IDC_SPRITE7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,41,80,10 + CONTROL "Sprite Priority 8",IDC_SPRITE8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,176,53,80,10 END IDD_GAMMA DIALOGEX 0, 0, 214, 59 @@ -353,7 +341,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK", IDOK, 79, 35, 50, 14 GROUPBOX "", IDC_STATIC, 3, 0, 128, 30 - RTEXT "Resolution:", IDC_RESOLUTION, 8, 11, 48, 10, SS_CENTERIMAGE + LTEXT "Resolution:", IDC_RESOLUTION, 8, 11, 48, 10, SS_CENTERIMAGE COMBOBOX IDC_CHOOSE_LIST, 60, 10, 64, 128, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Cancel", IDCANCEL, 25, 35, 50, 14 END diff --git a/src/burner/platform/win32/bzip.cpp b/src/burner/platform/win32/bzip.cpp index bd2ce2f28..99e9df42f 100644 --- a/src/burner/platform/win32/bzip.cpp +++ b/src/burner/platform/win32/bzip.cpp @@ -264,21 +264,35 @@ static int __cdecl BzipBurnLoadRom(unsigned char* Dest, int* pnWrote, int i) // show what we're doing BurnDrvGetRomName(&pszRomName, i, 0); if (pszRomName == NULL) { - pszRomName = "unknown"; + TCHAR szTempName[100]; + _stprintf(szTempName, _T("%s"), FBALoadStringEx(hAppInst, IDS_ERR_UNKNOWN, true)); + sprintf(pszRomName, "%s", TCHARToANSI(szTempName, NULL, 0)); } - _stprintf(szText, _T("Loading")); + + TCHAR szTempLoading[100]; + _stprintf(szTempLoading, _T("%s"), FBALoadStringEx(hAppInst, IDS_PROGRESS_LOADING_ONLY, true)); + _stprintf(szText, _T("%s"), szTempLoading); + if (ri.nType & (BRF_PRG | BRF_GRA | BRF_SND | BRF_BIOS)) { if (ri.nType & BRF_BIOS) { - _stprintf (szText + _tcslen(szText), _T(" %s"), _T("BIOS ")); + TCHAR szTempBios[100]; + _stprintf(szTempBios, _T("%s"), FBALoadStringEx(hAppInst, IDS_ERR_LOAD_DET_BIOS, true)); + _stprintf(szText + _tcslen(szText), _T(" %s"), szTempBios); } if (ri.nType & BRF_PRG) { - _stprintf (szText + _tcslen(szText), _T(" %s"), _T("program ")); + TCHAR szTempPrg[100]; + _stprintf(szTempPrg, _T("%s"), FBALoadStringEx(hAppInst, IDS_ERR_LOAD_DET_PRG, true)); + _stprintf(szText + _tcslen(szText), _T(" %s"), szTempPrg); } if (ri.nType & BRF_GRA) { - _stprintf (szText + _tcslen(szText), _T(" %s"), _T("graphics ")); + TCHAR szTempGra[100]; + _stprintf(szTempGra, _T("%s"), FBALoadStringEx(hAppInst, IDS_ERR_LOAD_DET_GRA, true)); + _stprintf (szText + _tcslen(szText), _T(" %s"), szTempGra); } if (ri.nType & BRF_SND) { - _stprintf (szText + _tcslen(szText), _T(" %s"), _T("sound ")); + TCHAR szTempSnd[100]; + _stprintf(szTempSnd, _T("%s"), FBALoadStringEx(hAppInst, IDS_ERR_LOAD_DET_SND, true)); + _stprintf (szText + _tcslen(szText), _T(" %s"), szTempSnd); } _stprintf(szText + _tcslen(szText), _T("(%hs)..."), pszRomName); } else { diff --git a/src/burner/platform/win32/inpd.cpp b/src/burner/platform/win32/inpd.cpp index 21c275c7e..91f2f6919 100644 --- a/src/burner/platform/win32/inpd.cpp +++ b/src/burner/platform/win32/inpd.cpp @@ -175,15 +175,15 @@ static int InpdListBegin() memset(&LvCol, 0, sizeof(LvCol)); LvCol.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; - LvCol.cx = 0x90; + LvCol.cx = 0xa0; LvCol.pszText = FBALoadStringEx(hAppInst, IDS_INPUT_INPUT, true); SendMessage(hInpdList, LVM_INSERTCOLUMN, 0, (LPARAM)&LvCol); - LvCol.cx = 0x90; + LvCol.cx = 0xa0; LvCol.pszText = FBALoadStringEx(hAppInst, IDS_INPUT_MAPPING, true); SendMessage(hInpdList, LVM_INSERTCOLUMN, 1, (LPARAM)&LvCol); - LvCol.cx = 0x28; + LvCol.cx = 0x38; LvCol.pszText = FBALoadStringEx(hAppInst, IDS_INPUT_STATE, true); SendMessage(hInpdList, LVM_INSERTCOLUMN, 2, (LPARAM)&LvCol); diff --git a/src/burner/platform/win32/resource.h b/src/burner/platform/win32/resource.h index 7d7f54eeb..a2a706f1b 100644 --- a/src/burner/platform/win32/resource.h +++ b/src/burner/platform/win32/resource.h @@ -213,10 +213,11 @@ #define IDC_DRVCOUNT 20200 #define IDC_TREE2 20201 -#define IDC_CHECK1 20202 -#define IDC_CHECK2 20203 -#define IDC_CHECK3 20204 -#define IDC_CHECK4 20205 +#define IDC_LAYER1 20202 +#define IDC_LAYER2 20203 +#define IDC_LAYER3 20204 +#define IDC_LAYER4 20205 +#define IDC_SHOW 20206 #define IDC_STATIC_SYS 20300 #define IDC_STATIC_OPT 20301 diff --git a/src/burner/platform/win32/resource_string.h b/src/burner/platform/win32/resource_string.h index b22d36af5..be2eb8098 100644 --- a/src/burner/platform/win32/resource_string.h +++ b/src/burner/platform/win32/resource_string.h @@ -34,6 +34,7 @@ #define IDS_MEMCARD_SELECT (IDS_STRING + 122) #define IDS_PROGRESS_LOADING (IDS_STRING + 140) +#define IDS_PROGRESS_LOADING_ONLY (IDS_STRING + 142) #define IDS_REPLAY_RECORD (IDS_STRING + 150) #define IDS_REPLAY_REPLAY (IDS_STRING + 152) @@ -210,6 +211,8 @@ #define IDS_NUMDIAL_NUM_FRAMES (IDS_STRING + 870) #define IDS_NUMDIAL_FILTER_SHARP (IDS_STRING + 872) +#define IDS_SCANNING_ROMS (IDS_STRING + 876) + #define IDS_CHEAT_SEARCH_NEW (IDS_STRING + 880) #define IDS_CHEAT_SEARCH_ADD_MATCH (IDS_STRING + 882) #define IDS_CHEAT_SEARCH_RESULTS (IDS_STRING + 884) diff --git a/src/burner/platform/win32/roms.cpp b/src/burner/platform/win32/roms.cpp index 83f5c53d7..11eedf543 100644 --- a/src/burner/platform/win32/roms.cpp +++ b/src/burner/platform/win32/roms.cpp @@ -372,7 +372,7 @@ static INT_PTR CALLBACK WaitProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM) // SendDlgItemMessage(hDlg, IDC_WAIT_PROG, PBM_SETSTEP, (WPARAM)1, 0); ShowWindow(GetDlgItem(hDlg, IDC_WAIT_LABEL_A), TRUE); - SendMessage(GetDlgItem(hDlg, IDC_WAIT_LABEL_A), WM_SETTEXT, (WPARAM)0, (LPARAM)_T("Scanning ROMs...")); + SendMessage(GetDlgItem(hDlg, IDC_WAIT_LABEL_A), WM_SETTEXT, (WPARAM)0, (LPARAM)FBALoadStringEx(hAppInst, IDS_SCANNING_ROMS, true)); ShowWindow(GetDlgItem(hDlg, IDCANCEL), TRUE); avOk = false; diff --git a/src/burner/platform/win32/sfactd.cpp b/src/burner/platform/win32/sfactd.cpp index dafe443e3..bb2f362c5 100644 --- a/src/burner/platform/win32/sfactd.cpp +++ b/src/burner/platform/win32/sfactd.cpp @@ -27,10 +27,10 @@ void ToggleSprite(unsigned char PriNum) static int SFactdUpdate() { - CheckDlgButton(hSFactdlg,IDC_CHECK1,(nBurnLayer & 1)?BST_CHECKED:BST_UNCHECKED); - CheckDlgButton(hSFactdlg,IDC_CHECK2,(nBurnLayer & 2)?BST_CHECKED:BST_UNCHECKED); - CheckDlgButton(hSFactdlg,IDC_CHECK3,(nBurnLayer & 4)?BST_CHECKED:BST_UNCHECKED); - CheckDlgButton(hSFactdlg,IDC_CHECK4,(nBurnLayer & 8)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hSFactdlg,IDC_LAYER1,(nBurnLayer & 1)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hSFactdlg,IDC_LAYER2,(nBurnLayer & 2)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hSFactdlg,IDC_LAYER3,(nBurnLayer & 4)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hSFactdlg,IDC_LAYER4,(nBurnLayer & 8)?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(hSFactdlg,IDC_SPRITE1,(nSpriteEnable & 0x01)?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(hSFactdlg,IDC_SPRITE2,(nSpriteEnable & 0x02)?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(hSFactdlg,IDC_SPRITE3,(nSpriteEnable & 0x04)?BST_CHECKED:BST_UNCHECKED); @@ -46,10 +46,10 @@ static int SFactdInit() { layerBackup=nBurnLayer; bRunPause=1; - CheckDlgButton(hSFactdlg,IDC_CHECK1,(nBurnLayer & 1)?BST_CHECKED:BST_UNCHECKED); - CheckDlgButton(hSFactdlg,IDC_CHECK2,(nBurnLayer & 2)?BST_CHECKED:BST_UNCHECKED); - CheckDlgButton(hSFactdlg,IDC_CHECK3,(nBurnLayer & 4)?BST_CHECKED:BST_UNCHECKED); - CheckDlgButton(hSFactdlg,IDC_CHECK4,(nBurnLayer & 8)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hSFactdlg,IDC_LAYER1,(nBurnLayer & 1)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hSFactdlg,IDC_LAYER2,(nBurnLayer & 2)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hSFactdlg,IDC_LAYER3,(nBurnLayer & 4)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hSFactdlg,IDC_LAYER4,(nBurnLayer & 8)?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(hSFactdlg,IDC_SPRITE1,(nSpriteEnable & 0x01)?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(hSFactdlg,IDC_SPRITE2,(nSpriteEnable & 0x02)?BST_CHECKED:BST_UNCHECKED); CheckDlgButton(hSFactdlg,IDC_SPRITE3,(nSpriteEnable & 0x04)?BST_CHECKED:BST_UNCHECKED); @@ -107,22 +107,22 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg,UINT Msg,WPARAM wParam,LPARAM lPara SFactdUpdate(); } } - if (Id==IDC_CHECK1 && Notify==BN_CLICKED) + if (Id==IDC_LAYER1 && Notify==BN_CLICKED) { ToggleLayer(1); SFactdUpdate(); } - if (Id==IDC_CHECK2 && Notify==BN_CLICKED) + if (Id==IDC_LAYER2 && Notify==BN_CLICKED) { ToggleLayer(2); SFactdUpdate(); } - if (Id==IDC_CHECK3 && Notify==BN_CLICKED) + if (Id==IDC_LAYER3 && Notify==BN_CLICKED) { ToggleLayer(4); SFactdUpdate(); } - if (Id==IDC_CHECK4 && Notify==BN_CLICKED) + if (Id==IDC_LAYER4 && Notify==BN_CLICKED) { ToggleLayer(8); SFactdUpdate(); diff --git a/src/burner/platform/win32/string.rc b/src/burner/platform/win32/string.rc index 0469fa7c1..aa3d1cce4 100644 --- a/src/burner/platform/win32/string.rc +++ b/src/burner/platform/win32/string.rc @@ -34,6 +34,7 @@ BEGIN IDS_MEMCARD_SELECT "Select new memory card" IDS_PROGRESS_LOADING "Loading and initialising %s..." + IDS_PROGRESS_LOADING_ONLY "Loading" IDS_REPLAY_RECORD "Record Input to File" IDS_REPLAY_REPLAY "Replay Input from File" @@ -210,6 +211,8 @@ BEGIN IDS_NUMDIAL_NUM_FRAMES "Number of Frames" IDS_NUMDIAL_FILTER_SHARP "Select desired filter sharpness" + IDS_SCANNING_ROMS "Scanning ROMs..." + IDS_CHEAT_SEARCH_NEW "New cheat search started" IDS_CHEAT_SEARCH_ADD_MATCH "%i Addresses Matched" IDS_CHEAT_SEARCH_RESULTS "Address %08X Value %02X"