From d756f55f467f220b7c7aea1a4b23a9496fe92ede Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 22 Jan 2006 13:17:39 +0200 Subject: [PATCH] imported winuaesrc1200b6.zip --- compemu_fpp.c | 60 +-- od-win32/keyboard_win32.c | 6 +- od-win32/resources/resource.h | 2 + od-win32/resources/winuae.rc | 67 +-- od-win32/resources/winuae_minimal.rc | 650 ++++++++++++------------ od-win32/screenshot.c | 201 +++++--- od-win32/win32.c | 356 +++++-------- od-win32/win32.h | 9 +- od-win32/win32gui.c | 79 ++- od-win32/winuae_msvc/winuae_msvc.vcproj | 4 +- 10 files changed, 727 insertions(+), 707 deletions(-) diff --git a/compemu_fpp.c b/compemu_fpp.c index ece77149..61fc6c24 100755 --- a/compemu_fpp.c +++ b/compemu_fpp.c @@ -23,7 +23,7 @@ #include "compemu.h" #if defined(JIT) -uae_u32 temp_fp[] = {0,0,0}, save_fp[3]; /* To convert between FP and */ +uae_u32 temp_fp[] = {0,0,0}; /* To convert between FP and */ /* 128 words, indexed through the low byte of the 68k fpu control word */ static uae_u16 x86_fpucw[]={ @@ -1171,26 +1171,16 @@ void comp_fpp_opp (uae_u32 opcode, uae_u16 extra) case 0x23: /* FMUL */ fmul_rr(dreg,sreg); break; - case 0x24: /* FSGLDIV */ + case 0x24: /* FSGLDIV is not exactly the same as FSDIV, */ + /* because both operands should be SINGLE precision, too */ + case 0x60: /* FSDIV */ + fdiv_rr(dreg,sreg); #if USE_X86_FPUCW - if ((regs.fpcr & 0xC0) == 0x40) { /* if SINGLE precision */ - fdiv_rr(dreg,sreg); + if ((regs.fpcr & 0xC0) == 0x40) /* if SINGLE precision */ break; - } #endif - if (!source) /* don't scratch, save sreg first */ - fmov_ext_mr((uae_u32)save_fp,sreg); - if (prec != 1) { - fmovs_mr((uae_u32)temp_fp,sreg); - fmovs_rm(sreg,(uae_u32)temp_fp); - } - fmovs_mr((uae_u32)temp_fp,dreg); - fmovs_rm(dreg,(uae_u32)temp_fp); - fdiv_rr(dreg,sreg); /* Both have to be SINGLE */ fmovs_mr((uae_u32)temp_fp,dreg); fmovs_rm(dreg,(uae_u32)temp_fp); - if (!source) /* restore sreg */ - fmov_ext_rm(sreg,(uae_u32)save_fp); break; case 0x25: /* FREM */ frem1_rr(dreg,sreg); @@ -1198,26 +1188,16 @@ void comp_fpp_opp (uae_u32 opcode, uae_u16 extra) case 0x26: /* FSCALE */ fscale_rr(dreg,sreg); break; - case 0x27: /* FSGLMUL */ + case 0x27: /* FSGLMUL is not exactly the same as FSMUL, */ + /* because both operands should be SINGLE precision, too */ + case 0x63: /* FSMUL */ + fmul_rr(dreg,sreg); #if USE_X86_FPUCW - if ((regs.fpcr & 0xC0) == 0x40) { /* if SINGLE precision */ - fmul_rr(dreg,sreg); + if ((regs.fpcr & 0xC0) == 0x40) /* if SINGLE precision */ break; - } #endif - if (!source) /* dont scratch, save sreg first */ - fmov_ext_mr((uae_u32)save_fp,sreg); - if (prec != 1) { - fmovs_mr((uae_u32)temp_fp,sreg); - fmovs_rm(sreg,(uae_u32)temp_fp); - } - fmovs_mr((uae_u32)temp_fp,dreg); - fmovs_rm(dreg,(uae_u32)temp_fp); - fmul_rr(dreg,sreg); /* Both have to be SINGLE */ fmovs_mr((uae_u32)temp_fp,dreg); fmovs_rm(dreg,(uae_u32)temp_fp); - if (!source) /* restore sreg */ - fmov_ext_rm(sreg,(uae_u32)save_fp); break; case 0x28: /* FSUB */ fsub_rr(dreg,sreg); @@ -1317,29 +1297,11 @@ void comp_fpp_opp (uae_u32 opcode, uae_u16 extra) fmov_rm(dreg,(uae_u32)temp_fp); } break; - case 0x60: /* FSDIV */ - fdiv_rr(dreg,sreg); -#if USE_X86_FPUCW - if ((regs.fpcr & 0xC0) == 0x40) /* if SINGLE precision */ - break; -#endif - fmovs_mr((uae_u32)temp_fp,dreg); - fmovs_rm(dreg,(uae_u32)temp_fp); - break; case 0x62: /* FSADD */ fadd_rr(dreg,sreg); #if USE_X86_FPUCW if ((regs.fpcr & 0xC0) == 0x40) /* if SINGLE precision */ break; -#endif - fmovs_mr((uae_u32)temp_fp,dreg); - fmovs_rm(dreg,(uae_u32)temp_fp); - break; - case 0x63: /* FSMUL */ - fmul_rr(dreg,sreg); -#if USE_X86_FPUCW - if ((regs.fpcr & 0xC0) == 0x40) /* if SINGLE precision */ - break; #endif fmovs_mr((uae_u32)temp_fp,dreg); fmovs_rm(dreg,(uae_u32)temp_fp); diff --git a/od-win32/keyboard_win32.c b/od-win32/keyboard_win32.c index 0fa560c1..d6030058 100755 --- a/od-win32/keyboard_win32.c +++ b/od-win32/keyboard_win32.c @@ -320,8 +320,10 @@ void my_kbd_handler (int keyboard, int scancode, int newstate) if (ctrlpressed ()) { code = AKS_TOGGLEFULLSCREEN; } else if (shiftpressed () || specialpressed ()) { - disablecapture (); - code = AKS_ENTERDEBUGGER; + if (!isfullscreen()) { + disablecapture (); + code = AKS_ENTERDEBUGGER; + } } else { code = AKS_ENTERGUI; } diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index 0c2a2542..bfe3562d 100755 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -837,6 +837,8 @@ #define IDC_PROGRESS1 1705 #define IDC_PROGRESSBAR 1705 #define IDC_PROGRESSBAR_TEXT 1706 +#define IDC_SCSIMODE2 1706 +#define IDC_LANGUAGE 1706 #define ID__FLOPPYDRIVES 40004 #define ID_FLOPPYDRIVES_DF0 40005 #define ID_ST_CONFIGURATION 40010 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 86202092..15800e26 100755 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -350,39 +350,41 @@ BEGIN CONTROL "",IDC_AMIKIT,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,157,169,80,15 END -IDD_MISC1 DIALOGEX 0, 0, 300, 219 +IDD_MISC1 DIALOGEX 0, 0, 300, 226 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced",IDC_STATIC,8,4,285,110 - CONTROL "Untrap mouse with middle button",IDC_JULIAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,17,120,10 - CONTROL "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,31,120,10 - CONTROL "On-screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,45,115,10 - CONTROL "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,59,117,10 - CONTROL "Don't show taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,72,117,10 - CONTROL "bsdsocket.library emulation",IDC_SOCKETS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,17,120,10 - CONTROL "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,31,120,10 - CONTROL "Don't use RGB overlays",IDC_NOOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,45,120,10 - CONTROL "Syncronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,72,115,10 - GROUPBOX "Keyboard LEDs",IDC_STATIC,7,120,85,94 - COMBOBOX IDC_KBLED1,22,134,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_KBLED2,22,153,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_KBLED3,22,173,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Logging",IDC_STATIC,97,120,195,25 - CONTROL "Create log file",IDC_CREATELOGFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,131,72,10,0,HIDC_CREATELOGFILE - CONTROL "Illegal memory accesses",IDC_ILLEGAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,131,95,10 - GROUPBOX "State Files",IDC_STATIC,98,146,195,69 - PUSHBUTTON "Load state...",IDC_DOLOADSTATE,105,162,49,14 - PUSHBUTTON "Save state...",IDC_DOSAVESTATE,106,188,49,14 - CONTROL "Enable state recording",IDC_STATE_CAPTURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,161,88,10 - RTEXT "Recording rate (seconds):",IDC_STATE_RATE_TEXT,157,179,86,10,SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_STATE_RATE,248,177,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - RTEXT "Recording buffer (MB):",IDC_STATE_BUFFERSIZE_TEXT,157,199,83,10,SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_STATE_BUFFERSIZE,248,197,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - CONTROL "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,85,117,10 - CONTROL "Catweasel",IDC_CATWEASEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,85,115,10 - CONTROL "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,196,64,10 - COMBOBOX IDC_SCSIMODE,159,57,104,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Advanced",IDC_STATIC,8,2,285,93 + CONTROL "Untrap mouse with middle button",IDC_JULIAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,15,120,10 + CONTROL "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,29,120,10 + CONTROL "On-screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,43,115,10 + CONTROL "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,57,117,10 + CONTROL "Don't show taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,70,117,10 + CONTROL "bsdsocket.library emulation",IDC_SOCKETS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,15,120,10 + CONTROL "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,29,120,10 + CONTROL "Don't use RGB overlays",IDC_NOOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,43,120,10 + CONTROL "Syncronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,70,115,10 + GROUPBOX "Keyboard LEDs",IDC_STATIC,7,125,85,94 + COMBOBOX IDC_KBLED1,22,139,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_KBLED2,22,158,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_KBLED3,22,178,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Logging",IDC_STATIC,97,125,195,25 + CONTROL "Create log file",IDC_CREATELOGFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,136,72,10,0,HIDC_CREATELOGFILE + CONTROL "Illegal memory accesses",IDC_ILLEGAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,136,95,10 + GROUPBOX "State Files",IDC_STATIC,98,150,195,69 + PUSHBUTTON "Load state...",IDC_DOLOADSTATE,105,167,49,14 + PUSHBUTTON "Save state...",IDC_DOSAVESTATE,106,193,49,14 + CONTROL "Enable state recording",IDC_STATE_CAPTURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,166,88,10 + RTEXT "Recording rate (seconds):",IDC_STATE_RATE_TEXT,157,184,86,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_STATE_RATE,248,182,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + RTEXT "Recording buffer (MB):",IDC_STATE_BUFFERSIZE_TEXT,157,204,83,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_STATE_BUFFERSIZE,248,202,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,83,117,10 + CONTROL "Catweasel",IDC_CATWEASEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,83,115,10 + CONTROL "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,201,64,10 + COMBOBOX IDC_SCSIMODE,159,55,104,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LANGUAGE,103,106,179,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Language",IDC_STATIC,7,97,285,25 END IDD_HARDFILE DIALOGEX 0, 0, 299, 212 @@ -744,6 +746,11 @@ BEGIN BOTTOMMARGIN, 212 END + IDD_MISC1, DIALOG + BEGIN + BOTTOMMARGIN, 219 + END + IDD_INPUT, DIALOG BEGIN BOTTOMMARGIN, 187 diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index 6d80e60e..dc70ea1c 100755 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -36,22 +36,22 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD EXSTYLE WS_EX_CONTEXTHELP FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "ROM Settings:",-1,5,0,290,74 - RTEXT "Boot ROM File:",IDC_ROMTEXT,10,15,75,10 + GROUPBOX "System ROM Settings",-1,5,0,290,74 + RTEXT "Main ROM file:",IDC_ROMTEXT,10,15,75,10 COMBOBOX IDC_ROMFILE,89,12,186,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_KICKCHOOSER,280,10,10,15 - RTEXT "Extended ROM File:",IDC_ROMFILE2TEXT,10,35,75,10 + RTEXT "Extended ROM file:",IDC_ROMFILE2TEXT,10,35,75,10 COMBOBOX IDC_ROMFILE2,89,31,186,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_ROMCHOOSER2,280,30,10,15 - CONTROL "MAPROM emulation [] Creates BlizKick-compatible memory area.",IDC_MAPROM, + CONTROL "MapROM emulation [] Creates a BlizKick-compatible memory area.",IDC_MAPROM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,95,54,82,10 - CONTROL "ShapeShifter support [] Patches Kickstart ROM for ShapeShifter compatibility.",IDC_KICKSHIFTER, + CONTROL "ShapeShifter support [] Patches the system ROM for ShapeShifter compatibility.",IDC_KICKSHIFTER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,54,80,10 - GROUPBOX "Misc settings:",-1,5,76,290,57 - RTEXT "Cartridge ROM File:",IDC_FLASHTEXT2,8,93,75,10 + GROUPBOX "Miscellaneous",-1,5,76,290,57 + RTEXT "Cartridge ROM file:",IDC_FLASHTEXT2,8,93,75,10 COMBOBOX IDC_CARTFILE,89,90,186,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_CARTCHOOSER,280,90,10,15 - RTEXT "Flash RAM File:",IDC_FLASHTEXT,8,112,75,10 + RTEXT "Flash RAM file:",IDC_FLASHTEXT,8,112,75,10 EDITTEXT IDC_FLASHFILE,89,110,185,13,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_FLASHCHOOSER,280,110,10,15 END @@ -61,36 +61,37 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Screen",IDC_SCREENRESTEXT,12,0,199,67,BS_LEFT - RTEXT "Fullscreen",IDC_SELECTRESTEXT,17,17,34,15,SS_CENTERIMAGE - COMBOBOX IDC_DISPLAYSELECT,57,10,147,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_RESOLUTION,57,27,52,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_REFRESHRATE,143,27,61,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - RTEXT "Windowed",IDC_WINDOWEDTEXT,18,51,35,8 - EDITTEXT IDC_XSIZE,57,48,35,12,ES_NUMBER - EDITTEXT IDC_YSIZE,101,48,35,12,ES_NUMBER - CONTROL "VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,145,49,54,10 - GROUPBOX "Settings",IDC_SETTINGSTEXT,12,77,199,89 - CONTROL "Full Screen",IDC_AFULLSCREEN,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,35,89,90,10 - CONTROL "Full Screen RTG",IDC_PFULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,131,89,70,10,0,HIDC_PFULLSCREEN - CONTROL "Correct aspect ratio",IDC_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,35,106,90,10 - CONTROL "Lo-res",IDC_LORES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,131,106,70,10,0,HIDC_LORES + RTEXT "Full screen:",IDC_SELECTRESTEXT,17,17,38,15,SS_CENTERIMAGE + COMBOBOX IDC_DISPLAYSELECT,59,10,147,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_RESOLUTION,59,27,52,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_REFRESHRATE,145,27,61,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Windowed:",IDC_WINDOWEDTEXT,18,51,37,8 + EDITTEXT IDC_XSIZE,59,48,35,12,ES_NUMBER + EDITTEXT IDC_YSIZE,103,48,35,12,ES_NUMBER + CONTROL "Vertical sync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,147,49,54,10 + GROUPBOX "Settings",IDC_SETTINGSTEXT,12,73,199,93 + CONTROL "Full-screen native modes",IDC_AFULLSCREEN,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,21,85,92,10 + CONTROL "Full-screen RTG modes",IDC_PFULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,85,87,10 + CONTROL "Correct aspect ratio",IDC_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,21,99,92,10 + CONTROL "Force low resolution",IDC_LORES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,99,85,10 LTEXT "Refresh:",IDC_REFRESHTEXT,18,129,28,8 - CONTROL "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,46,124,75,20 - EDITTEXT IDC_RATETEXT,126,128,77,12,ES_CENTER | ES_READONLY + CONTROL "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,124,75,20 + EDITTEXT IDC_RATETEXT,127,128,77,12,ES_CENTER | ES_READONLY GROUPBOX "Centering",IDC_STATIC,221,0,61,67 CONTROL "Horizontal",IDC_XCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,16,45,10 CONTROL "Vertical",IDC_YCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,32,39,10 - GROUPBOX "Line mode",IDC_LINEMODE,222,77,61,74 + GROUPBOX "Line Mode",IDC_LINEMODE,222,73,61,73 CONTROL "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,233,89,38,10 - CONTROL "Doubled",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,233,105,41,10 - CONTROL "Scanline",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,233,121,40,10 + CONTROL "Double",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,233,105,41,10 + CONTROL "Scanlines",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,233,121,40,10 COMBOBOX IDC_DA_MODE,35,183,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | NOT WS_VISIBLE | WS_TABSTOP,99,179,101,20 - PUSHBUTTON "Detect pixel format",IDC_TEST16BIT,210,181,73,14,0,0,HIDC_TEST16BIT - LTEXT "FPS Adj.",IDC_REFRESH2TEXT,18,149,28,8 - CONTROL "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,46,144,127,20 - EDITTEXT IDC_RATE2TEXT,177,148,26,12,ES_CENTER | ES_READONLY - COMBOBOX IDC_RESOLUTIONDEPTH,110,27,32,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Detect Pixel Format",IDC_TEST16BIT,210,181,73,14 + LTEXT "FPS adj.:",IDC_REFRESH2TEXT,17,149,30,8 + CONTROL "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,144,127,20 + EDITTEXT IDC_RATE2TEXT,178,148,26,12,ES_CENTER | ES_READONLY + COMBOBOX IDC_RESOLUTIONDEPTH,112,27,32,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,113,85,10 END IDD_MEMORY DIALOGEX 0, 0, 300, 175 @@ -98,16 +99,16 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD EXSTYLE WS_EX_CONTEXTHELP FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Memory Settings:",-1,14,40,274,93 + GROUPBOX "Memory Settings",-1,14,40,274,93 RTEXT "Chip:",-1,24,60,20,10,SS_CENTERIMAGE CONTROL "Slider1",IDC_CHIPMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,54,55,50,20 RTEXT "Fast:",IDC_FASTTEXT,24,85,20,10,SS_CENTERIMAGE CONTROL "Slider1",IDC_FASTMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,54,80,50,20 RTEXT "Slow:",-1,149,60,20,10,SS_CENTERIMAGE CONTROL "Slider1",IDC_SLOWMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,179,55,50,20 - RTEXT "Z3-Fast:",IDC_Z3TEXT,139,85,30,10,SS_CENTERIMAGE + RTEXT "Z3 Fast:",IDC_Z3TEXT,139,85,30,10,SS_CENTERIMAGE CONTROL "Slider1",IDC_Z3FASTMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,179,80,60,20 - RTEXT "RTG: [] Graphics card memory. Required for Picasso96 emulation.",IDC_GFXCARDTEXT,96,110,76,10,SS_NOTIFY | SS_CENTERIMAGE + RTEXT "RTG: [] Graphics card memory. Required for RTG (Picasso96) emulation.",IDC_GFXCARDTEXT,81,110,90,10,SS_NOTIFY | SS_CENTERIMAGE CONTROL "Slider1",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,179,105,60,20 EDITTEXT IDC_CHIPRAM,105,59,30,12,ES_CENTER | ES_READONLY EDITTEXT IDC_FASTRAM,105,86,30,12,ES_CENTER | ES_READONLY @@ -120,7 +121,7 @@ IDD_CPU DIALOGEX 0, 0, 300, 177 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - GROUPBOX "CPU Type:",IDC_STATIC,5,5,81,166,BS_LEFT + GROUPBOX "CPU",IDC_STATIC,5,5,81,166,BS_LEFT CONTROL "68000",IDC_CPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,18,63,10 CONTROL "68010",IDC_CPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,33,65,10 CONTROL "68EC020",IDC_CPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,48,65,10 @@ -130,9 +131,9 @@ BEGIN CONTROL "68040",IDC_CPU6,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,108,66,10 CONTROL "More compatible [] Emulate 68000's prefetch registers. More compatible but slower.",IDC_COMPATIBLE, "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,10,130,70,10 - CONTROL "JIT [] Enable Just-In-Time CPU emulator. Increases the speed of CPU emulation 10-100x. Requires 68020 or 68040 CPU.",IDC_JITENABLE, + CONTROL "JIT [] Enable just-in-time CPU emulator. Significantly increases the speed of the CPU emulation. Requires 68020 or 68040 CPU.",IDC_JITENABLE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,145,64,10 - GROUPBOX "CPU Emulation Speed:",IDC_STATIC,90,5,205,86 + GROUPBOX "CPU Emulation Speed",IDC_STATIC,90,5,205,86 CONTROL "Fastest possible, but maintain chipset timing",IDC_CS_HOST, "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,95,18,195,10 CONTROL "Match A500 speed",IDC_CS_68000,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,95,32,195,10 @@ -141,20 +142,20 @@ BEGIN RTEXT "CPU",IDC_CS_CPU_TEXT,96,71,15,10,SS_CENTERIMAGE | WS_TABSTOP CONTROL "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,114,66,67,20 LTEXT "Chipset",IDC_CS_CHIPSET_TEXT,182,71,25,10,SS_CENTERIMAGE | NOT WS_GROUP | WS_TABSTOP - RTEXT "CPU Idle",IDC_CS_CPU_TEXT2,236,56,32,10,SS_CENTERIMAGE | WS_TABSTOP + RTEXT "CPU idle",IDC_CS_CPU_TEXT2,236,56,32,10,SS_CENTERIMAGE | WS_TABSTOP CONTROL "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,219,66,69,20 - GROUPBOX "Advanced JIT settings:",IDC_STATIC,90,92,205,79 - RTEXT "Cache Size:",IDC_CS_CACHE_TEXT,95,109,45,10,SS_CENTERIMAGE | WS_TABSTOP + GROUPBOX "Advanced JIT Settings",IDC_STATIC,90,92,205,79 + RTEXT "Cache size:",IDC_CS_CACHE_TEXT,95,109,45,10,SS_CENTERIMAGE | WS_TABSTOP CONTROL "Slider1",IDC_CACHE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,140,104,115,20 EDITTEXT IDC_CACHETEXT,255,109,30,12,ES_CENTER | ES_READONLY - CONTROL "Hard Flush",IDC_HARDFLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,128,60,10 - CONTROL "Const Jump",IDC_CONSTJUMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,142,60,10 - CONTROL "FPU Support",IDC_JITFPU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,155,60,10 - CONTROL "Force Settings",IDC_FORCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,128,61,10 - CONTROL "No Flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,142,60,10 + CONTROL "Hard flush",IDC_HARDFLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,128,60,10 + CONTROL "Constant jump",IDC_CONSTJUMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,142,60,10 + CONTROL "FPU support",IDC_JITFPU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,155,60,10 + CONTROL "Force settings",IDC_FORCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,128,61,10 + CONTROL "No flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,142,60,10 CONTROL "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,230,128,34,10 CONTROL "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,230,142,45,10 - CONTROL "After Picasso96",IDC_TRUST2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,230,155,64,10 + CONTROL "After RTG",IDC_TRUST2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,230,155,64,10 END IDD_FLOPPY DIALOGEX 0, 0, 300, 224 @@ -164,42 +165,42 @@ BEGIN RTEXT "DF0:",IDC_STATIC,10,7,20,10,SS_CENTERIMAGE COMBOBOX IDC_DF0TEXT,2,22,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DF0TYPE,123,6,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Write Protected",IDC_STATIC,174,8,59,10,SS_CENTERIMAGE + RTEXT "Write-protected",IDC_STATIC,174,8,59,10,SS_CENTERIMAGE CONTROL "",IDC_DF0WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,4,10,15 PUSHBUTTON "Eject",IDC_EJECT0,253,4,30,15 PUSHBUTTON "...",IDC_DF0,287,4,10,15 RTEXT "DF1:",IDC_STATIC,10,42,20,10,SS_CENTERIMAGE COMBOBOX IDC_DF1TEXT,2,58,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DF1TYPE,123,42,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Write Protected",IDC_STATIC,174,43,59,10,SS_CENTERIMAGE + RTEXT "Write-protected",IDC_STATIC,174,43,59,10,SS_CENTERIMAGE CONTROL "",IDC_DF1WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,40,10,15 PUSHBUTTON "Eject",IDC_EJECT1,253,40,30,15 PUSHBUTTON "...",IDC_DF1,287,40,10,15 RTEXT "DF2:",IDC_STATIC,10,77,20,10,SS_CENTERIMAGE COMBOBOX IDC_DF2TEXT,2,93,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DF2TYPE,123,77,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Write Protected",IDC_STATIC,174,77,59,10,SS_CENTERIMAGE + RTEXT "Write-protected",IDC_STATIC,174,77,59,10,SS_CENTERIMAGE CONTROL "",IDC_DF2WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,75,9,15 PUSHBUTTON "Eject",IDC_EJECT2,253,75,30,15 PUSHBUTTON "...",IDC_DF2,287,75,10,15 RTEXT "DF3:",IDC_STATIC,10,112,20,9,SS_CENTERIMAGE COMBOBOX IDC_DF3TEXT,2,128,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DF3TYPE,123,112,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Write Protected",IDC_STATIC,174,113,59,10,SS_CENTERIMAGE + RTEXT "Write-protected",IDC_STATIC,174,113,59,10,SS_CENTERIMAGE CONTROL "",IDC_DF3WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,111,9,15 PUSHBUTTON "Eject",IDC_EJECT3,253,110,30,15 PUSHBUTTON "...",IDC_DF3,287,109,10,15 - GROUPBOX "New disk image",IDC_SETTINGSTEXT,5,183,289,35 + GROUPBOX "New Floppy Disk Image",IDC_SETTINGSTEXT,5,183,289,35 COMBOBOX IDC_FLOPPYTYPE,16,196,51,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Create Standard ""Floppy"" [] Creates standard 880kb ADF disk image.",IDC_CREATE,76,196,97,15 - PUSHBUTTON "Create Custom ""Floppy"" [] Creates ~2Mb low level (MFM) ADF disk image. Useful for programs that use non-AmigaDOS disk format (for example some save disks or MSDOS formatted floppies)",IDC_CREATE_RAW,183,196,101,15 - GROUPBOX "Floppy drive emulation speed",IDC_SETTINGSTEXT2,5,144,289,35 + PUSHBUTTON "Create Standard Disk [] Creates a standard 880 KB ADF disk image.",IDC_CREATE,76,196,97,15 + PUSHBUTTON "Create Custom Disk [] Creates a low level (MFM) ADF disk image (about 2MB). Useful for programs that use non-standard disk formats (for example some save disks or DOS-formatted floppies)",IDC_CREATE_RAW,183,196,101,15 + GROUPBOX "Floppy Drive Emulation Speed",IDC_SETTINGSTEXT2,5,144,289,35 CONTROL "",IDC_FLOPPYSPD,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,32,152,116,20 EDITTEXT IDC_FLOPPYSPDTEXT,169,155,107,12,ES_CENTER | ES_READONLY - PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE0,43,5,70,15,NOT WS_VISIBLE - PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE1,43,40,70,15,NOT WS_VISIBLE - PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE2,43,75,70,15,NOT WS_VISIBLE - PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE3,43,110,70,15,NOT WS_VISIBLE + PUSHBUTTON "Delete save image",IDC_SAVEIMAGE0,43,5,70,15,NOT WS_VISIBLE + PUSHBUTTON "Delete save image",IDC_SAVEIMAGE1,43,40,70,15,NOT WS_VISIBLE + PUSHBUTTON "Delete save image",IDC_SAVEIMAGE2,43,75,70,15,NOT WS_VISIBLE + PUSHBUTTON "Delete save image",IDC_SAVEIMAGE3,43,110,70,15,NOT WS_VISIBLE END IDD_HARDDISK DIALOGEX 0, 0, 300, 231 @@ -210,13 +211,13 @@ BEGIN CONTROL "List1",IDC_VOLUMELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,0,290,182 PUSHBUTTON "Add &Directory...",IDC_NEW_FS,5,186,60,15 PUSHBUTTON "Add &Hardfile...",IDC_NEW_HF,70,186,60,15 - PUSHBUTTON "Add Ha&rddrive...",IDC_NEW_HD,135,186,60,15 + PUSHBUTTON "Add Ha&rd Drive...",IDC_NEW_HD,135,186,60,15 PUSHBUTTON "Remove",IDC_REMOVE,235,186,60,15 PUSHBUTTON "&Properties",IDC_EDIT,235,207,60,15 - CONTROL "Add PC Drives at Startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,205,100,10,0,HIDC_MAPDRIVES + CONTROL "Add PC drives at startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,205,100,10,0,HIDC_MAPDRIVES CONTROL "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,205,115,10 CONTROL "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,216,115,10 - CONTROL "Add Network Drives...",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,216,101,10,0,HIDC_MAPDRIVES_NET + CONTROL "Include network drives",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,216,101,10,0,HIDC_MAPDRIVES_NET END IDD_SOUND DIALOGEX 0, 0, 300, 244 @@ -233,33 +234,33 @@ BEGIN GROUPBOX "Volume",IDC_STATIC,131,30,164,31 CONTROL "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,137,38,105,20 EDITTEXT IDC_SOUNDVOLUME2,247,41,40,12,ES_CENTER | ES_READONLY - GROUPBOX "Sound buffer size",IDC_STATIC,132,67,164,31 + GROUPBOX "Sound Buffer Size",IDC_STATIC,132,67,164,31 CONTROL "Slider1",IDC_SOUNDBUFFERRAM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,138,75,106,19 EDITTEXT IDC_SOUNDBUFFERMEM,248,78,40,12,ES_CENTER | ES_READONLY GROUPBOX "Settings",IDC_SOUNDINTERPOLATION2,6,101,290,60 - LTEXT "Frequency",IDC_SOUNDFREQTXT,13,111,37,8,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDFREQ,15,120,59,75,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - LTEXT "Audio filter",IDC_SOUNDFILTERTXT,227,135,34,8,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDFILTER,227,144,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Stereo mode",IDC_SOUNDSTEREOTXT,86,111,41,8,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDSTEREO,85,120,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Interpolation",IDC_SOUNDINTERPOLATIONTXT,227,111,41,8,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDINTERPOLATION,227,119,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Stereo separation",IDC_SOUNDSTEREOSEPTXT,155,111,56,8,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDSTEREOSEP,156,120,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Stereo mixing delay",IDC_SOUNDSTEREOMIXTXT,155,135,63,8,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDSTEREOMIX,156,144,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Disk Drive Sound Emulation",IDC_STATIC,6,164,290,46 + LTEXT "Frequency:",IDC_SOUNDFREQTXT,11,111,37,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDFREQ,13,120,51,75,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + LTEXT "Audio filter:",IDC_SOUNDFILTERTXT,209,135,34,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDFILTER,209,144,80,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Stereo mode:",IDC_SOUNDSTEREOTXT,74,111,41,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDSTEREO,73,120,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Interpolation:",IDC_SOUNDINTERPOLATIONTXT,209,111,41,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDINTERPOLATION,209,119,80,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Stereo separation:",IDC_SOUNDSTEREOSEPTXT,141,111,56,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDSTEREOSEP,142,120,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Stereo mixing delay:",IDC_SOUNDSTEREOMIXTXT,141,135,63,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDSTEREOMIX,142,144,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Floppy Drive Sound Emulation",IDC_STATIC,6,164,290,46 CONTROL "",IDC_SOUNDDRIVEVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,14,172,107,19 EDITTEXT IDC_SOUNDDRIVEVOLUME2,124,178,40,12,ES_CENTER | ES_READONLY COMBOBOX IDC_SOUNDDRIVE,237,174,46,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SOUNDDRIVESELECT,18,192,265,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Sound driver lag compensation",IDC_STATIC,6,211,290,31 + GROUPBOX "Audio Driver Lag Compensation",IDC_STATIC,6,211,290,31 CONTROL "Slider1",IDC_SOUNDADJUST,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,14,221,107,19 EDITTEXT IDC_SOUNDADJUSTNUM,124,224,40,12,ES_CENTER | ES_READONLY PUSHBUTTON "Calibrate",IDC_SOUNDCALIBRATE,183,223,40,14 - COMBOBOX IDC_SOUNDSWAP,85,144,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Swap channels",IDC_SOUNDSWAPTXT,86,135,50,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDSWAP,73,144,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Swap channels:",IDC_SOUNDSWAPTXT,82,135,50,8,SS_CENTERIMAGE END IDD_LOADSAVE DIALOGEX 0, 0, 302, 241 @@ -276,14 +277,14 @@ BEGIN CONTROL "Ignore link",IDC_CONFIGNOLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,206,48,10 EDITTEXT IDC_EDITPATH,199,161,49,15,ES_AUTOHSCROLL | WS_DISABLED,0,HIDC_EDITPATH CONTROL "Autoload",IDC_CONFIGAUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,253,163,42,10 - GROUPBOX "Extra info",IDC_STATIC,199,179,96,38,BS_LEFT + GROUPBOX "Additional Information",IDC_STATIC,199,179,96,38,BS_LEFT PUSHBUTTON "View",IDC_VIEWINFO,210,195,35,15 PUSHBUTTON "Set",IDC_SETINFO,250,195,35,15 PUSHBUTTON "Load",IDC_QUICKLOAD,5,225,40,15 PUSHBUTTON "Save",IDC_QUICKSAVE,50,225,40,15 PUSHBUTTON "Load From...",IDC_LOAD,125,225,45,15 - PUSHBUTTON "Save As...",IDC_SAVE,175,225,40,15 PUSHBUTTON "Delete",IDC_DELETE,255,225,40,15 + PUSHBUTTON "Save As...",IDC_SAVE,175,225,40,15 END IDD_PORTS DIALOGEX 0, 0, 300, 222 @@ -296,7 +297,7 @@ BEGIN PUSHBUTTON "Flush print job",IDC_FLUSHPRINTER,220,14,58,12 CONTROL "PostScript detection",IDC_PSPRINTERDETECT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,11,33,78,12 CONTROL "PostScript printer emulation",IDC_PSPRINTER,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,93,33,100,12 - RTEXT "Autoflush timeout [] Time in seconds after pending print job is automatically flushed.",IDC_PRINTERAUTOFLUSHTXT,202,32,57,15,SS_NOTIFY | SS_CENTERIMAGE + RTEXT "Autoflush timeout [] Time in seconds after a pending print job is automatically flushed.",IDC_PRINTERAUTOFLUSHTXT,202,32,57,15,SS_NOTIFY | SS_CENTERIMAGE EDITTEXT IDC_PRINTERAUTOFLUSH,263,33,25,12,ES_NUMBER RTEXT "Ghostscript extra parameters:",IDC_STATIC,12,49,91,15,SS_CENTERIMAGE EDITTEXT IDC_PS_PARAMS,120,50,169,12,ES_AUTOHSCROLL @@ -304,7 +305,7 @@ BEGIN COMBOBOX IDC_SERIAL,19,83,95,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Shared",IDC_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,132,83,48,13 CONTROL "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,185,83,53,12 - CONTROL "Direct []Use when emulating serial linked games on two PCs running WinUAE",IDC_SERIAL_DIRECT, + CONTROL "Direct []Use when emulating serial-link games on two PCs running WinUAE",IDC_SERIAL_DIRECT, "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,243,83,46,12 GROUPBOX "MIDI",IDC_MIDIFRAME,4,104,292,33 RTEXT "Out:",IDC_MIDI,10,115,34,15,SS_CENTERIMAGE @@ -314,7 +315,7 @@ BEGIN GROUPBOX "Mouse/Joystick Ports",IDC_PORT0,4,139,292,75 COMBOBOX IDC_PORT0_JOYS,45,155,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_PORT1_JOYS,45,176,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Swap Ports",IDC_SWAP,211,195,75,14 + PUSHBUTTON "Swap ports",IDC_SWAP,211,195,75,14 RTEXT "Port 0:",IDC_STATIC,11,154,25,15,SS_CENTERIMAGE RTEXT "Port 1:",IDC_STATIC,11,175,25,15,SS_CENTERIMAGE LTEXT "X-Arcade layout information []#1",IDC_STATIC,16,195,106,15,SS_NOTIFY | SS_CENTERIMAGE @@ -345,42 +346,45 @@ BEGIN CONTROL "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,145,80,15 CONTROL "",IDC_ABIME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,145,80,15 CONTROL "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,90,80,20 - CONTROL "",IDC_AMIGASYS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,169,80,15 + CONTROL "",IDC_AMIGASYS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,63,169,80,15 + CONTROL "",IDC_AMIKIT,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,157,169,80,15 END -IDD_MISC1 DIALOGEX 0, 0, 300, 219 +IDD_MISC1 DIALOGEX 0, 0, 300, 226 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced:",IDC_STATIC,8,4,285,110 - CONTROL "Middle-Mouse-Button --> ALT-TAB",IDC_JULIAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,19,120,10 - CONTROL "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,34,120,10 - CONTROL "On-Screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,49,115,10 - CONTROL "UAEscsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,64,117,10 - CONTROL "Don't show Taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,78,117,10 - CONTROL "BSDsocket.library emulation",IDC_SOCKETS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,19,120,10 - CONTROL "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,34,120,10 - CONTROL "Don't use RGB overlays",IDC_NOOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,49,120,10 - CONTROL "Syncronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,78,115,10 - GROUPBOX "Keyboard LEDs:",IDC_STATIC,7,120,85,94 - COMBOBOX IDC_KBLED1,22,134,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_KBLED2,22,153,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_KBLED3,22,173,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Logging:",IDC_STATIC,97,120,195,25 - CONTROL "Create log file",IDC_CREATELOGFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,131,72,10,0,HIDC_CREATELOGFILE - CONTROL "Illegal mem accesses",IDC_ILLEGAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,131,80,10 - GROUPBOX "State files:",IDC_STATIC,98,146,195,69 - PUSHBUTTON "Load state...",IDC_DOLOADSTATE,105,162,49,14 - PUSHBUTTON "Save state...",IDC_DOSAVESTATE,106,188,49,14 - CONTROL "Enable state recording",IDC_STATE_CAPTURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,161,88,10 - RTEXT "Recording rate (seconds)",IDC_STATE_RATE_TEXT,157,179,86,10,SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_STATE_RATE,248,177,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - RTEXT "Recording buffer (MB)",IDC_STATE_BUFFERSIZE_TEXT,157,199,83,10,SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_STATE_BUFFERSIZE,248,197,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - CONTROL "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,92,117,10 - CONTROL "Catweasel",IDC_CATWEASEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,92,115,10 - CONTROL "USB-mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,196,64,10 - COMBOBOX IDC_SCSIMODE,159,62,104,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Advanced",IDC_STATIC,8,2,285,93 + CONTROL "Untrap mouse with middle button",IDC_JULIAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,15,120,10 + CONTROL "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,29,120,10 + CONTROL "On-screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,43,115,10 + CONTROL "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,57,117,10 + CONTROL "Don't show taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,70,117,10 + CONTROL "bsdsocket.library emulation",IDC_SOCKETS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,15,120,10 + CONTROL "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,29,120,10 + CONTROL "Don't use RGB overlays",IDC_NOOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,43,120,10 + CONTROL "Syncronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,70,115,10 + GROUPBOX "Keyboard LEDs",IDC_STATIC,7,125,85,94 + COMBOBOX IDC_KBLED1,22,139,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_KBLED2,22,158,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_KBLED3,22,178,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Logging",IDC_STATIC,97,125,195,25 + CONTROL "Create log file",IDC_CREATELOGFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,136,72,10,0,HIDC_CREATELOGFILE + CONTROL "Illegal memory accesses",IDC_ILLEGAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,136,95,10 + GROUPBOX "State Files",IDC_STATIC,98,150,195,69 + PUSHBUTTON "Load state...",IDC_DOLOADSTATE,105,167,49,14 + PUSHBUTTON "Save state...",IDC_DOSAVESTATE,106,193,49,14 + CONTROL "Enable state recording",IDC_STATE_CAPTURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,166,88,10 + RTEXT "Recording rate (seconds):",IDC_STATE_RATE_TEXT,157,184,86,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_STATE_RATE,248,182,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + RTEXT "Recording buffer (MB):",IDC_STATE_BUFFERSIZE_TEXT,157,204,83,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_STATE_BUFFERSIZE,248,202,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,83,117,10 + CONTROL "Catweasel",IDC_CATWEASEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,83,115,10 + CONTROL "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,201,64,10 + COMBOBOX IDC_SCSIMODE,159,55,104,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_LANGUAGE,103,106,179,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Language",IDC_STATIC,7,97,285,25 END IDD_HARDFILE DIALOGEX 0, 0, 299, 212 @@ -388,36 +392,36 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS CAPTION "Hardfile Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - GROUPBOX "Hard File Settings",IDC_STATIC,10,5,280,113 + GROUPBOX "Settings",IDC_STATIC,10,5,280,113 RTEXT "Path:",IDC_HARDFILE_DIR_TEXT,26,18,22,10 EDITTEXT IDC_PATH_NAME,52,15,213,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_SELECTOR,271,15,11,15 - RTEXT "Filesystem:",IDC_HARDFILE_FILESYS_TEXT,14,37,34,10 + RTEXT "File system:",IDC_HARDFILE_FILESYS_TEXT,14,37,34,10 EDITTEXT IDC_PATH_FILESYS,52,34,213,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_FILESYS_SELECTOR,271,34,11,15 RTEXT "Device:",IDC_HARDFILE_DEVICE_TEXT,17,58,31,10 EDITTEXT IDC_HARDFILE_DEVICE,52,54,40,15,ES_AUTOHSCROLL - RTEXT "BootPri:",IDC_HARDFILE_BOOTPRI_TEXT,18,79,30,8 - EDITTEXT IDC_HARDFILE_BOOTPRI,52,75,40,15 - CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,57,50,10 - PUSHBUTTON "Enable RDB-mode",IDC_HDF_RDB,192,55,92,14 + RTEXT "Boot priority:",IDC_HARDFILE_BOOTPRI_TEXT,15,101,44,8 + EDITTEXT IDC_HARDFILE_BOOTPRI,65,96,40,15 + CONTROL "Read/write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,57,50,10 + PUSHBUTTON "Enable RDB mode",IDC_HDF_RDB,192,55,92,14 RTEXT "Surfaces:",IDC_SURFACES_TEXT,112,79,30,10 EDITTEXT IDC_HEADS,147,75,35,15,ES_NUMBER RTEXT "Reserved:",IDC_RESERVED_TEXT,197,79,35,10 EDITTEXT IDC_RESERVED,237,75,35,15,ES_NUMBER RTEXT "Sectors:",IDC_SECTORS_TEXT,112,101,30,10 EDITTEXT IDC_SECTORS,147,96,35,15,ES_NUMBER - RTEXT "Block-Size:",IDC_BLOCKSIZE_TEXT,197,101,35,10 + RTEXT "Block size:",IDC_BLOCKSIZE_TEXT,197,101,35,10 EDITTEXT IDC_BLOCKSIZE,237,96,35,15,ES_NUMBER - GROUPBOX "New Hard File",IDC_STATIC,10,120,280,62 + GROUPBOX "New hard disk image file",IDC_STATIC,10,120,280,62 PUSHBUTTON "Create",IDC_HF_CREATE,50,135,80,14 EDITTEXT IDC_HF_SIZE,146,135,61,15,ES_NUMBER PUSHBUTTON "OK",IDOK,102,191,50,14 PUSHBUTTON "Cancel",IDCANCEL,158,191,50,14 EDITTEXT IDC_HF_DOSTYPE,146,158,61,15 COMBOBOX IDC_HF_TYPE,50,158,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - RTEXT "DosType",IDC_STATIC,212,160,30,10,SS_CENTERIMAGE - RTEXT "Megabytes",IDC_STATIC,212,138,35,10,SS_CENTERIMAGE + RTEXT "DOS type",IDC_STATIC,212,160,30,10,SS_CENTERIMAGE + RTEXT "MB",IDC_STATIC,212,138,11,10,SS_CENTERIMAGE RTEXT "Type:",IDC_STATIC,18,160,25,10,SS_CENTERIMAGE END @@ -426,23 +430,23 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS CAPTION "Volume Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - LTEXT "Device Name:",-1,5,9,54,10 + LTEXT "Device name:",-1,5,9,54,10 EDITTEXT IDC_VOLUME_DEVICE,65,5,86,15,ES_AUTOHSCROLL - LTEXT "Volume Label:",-1,5,31,54,10 + LTEXT "Volume label:",-1,5,31,54,10 EDITTEXT IDC_VOLUME_NAME,65,25,85,15,ES_AUTOHSCROLL LTEXT "Path:",-1,5,51,44,10 EDITTEXT IDC_PATH_NAME,65,46,213,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_SELECTOR,283,46,10,15 - CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,70,50,10 - RTEXT "BootPri:",IDC_VOLUME_BOOTPRI_TEXT,68,70,30,8 - EDITTEXT IDC_VOLUME_BOOTPRI,106,68,27,15 + CONTROL "Read/write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,70,50,10 + RTEXT "Boot priority:",IDC_VOLUME_BOOTPRI_TEXT,135,70,51,8 + EDITTEXT IDC_VOLUME_BOOTPRI,199,68,27,15 PUSHBUTTON "OK",IDOK,120,91,48,15 PUSHBUTTON "Cancel",IDCANCEL,175,91,48,15 END IDD_SETINFO DIALOGEX 0, 0, 229, 85 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Info Settings" +CAPTION "Additional Information Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN RTEXT "Path:",-1,5,20,24,15,SS_CENTERIMAGE @@ -456,38 +460,38 @@ IDD_CHIPSET DIALOGEX 0, 65490, 300, 229 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - GROUPBOX "Chipset type",IDC_STATIC,14,11,145,82 - CONTROL "OCS [] The original Amiga chipset (A1000, most A500s)",IDC_OCS, + GROUPBOX "Chipset",IDC_STATIC,14,11,145,82 + CONTROL "OCS [] Original chipset. A1000 and most A500s.",IDC_OCS, "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,38,31,51,10 - CONTROL "ECS Agnus [] Partial Enhanced Chipset. Later A500 and A2000 hardware revisions.",IDC_ECS_AGNUS, + CONTROL "ECS Agnus [] Enhanced chipset (ECS Agnus chip only). Later A500 and A2000 hardware revisions.",IDC_ECS_AGNUS, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,38,47,55,10 - CONTROL "Full ECS [] Full ECS Chipset, ECS Agnus and ECS Denise. (A500+, A600, A3000)",IDC_ECS, + CONTROL "Full ECS [] Full ECS chipset (ECS Agnus and ECS Denise chips). A500+, A600 and A3000.",IDC_ECS, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,38,63,52,10 - CONTROL "AGA [] The next generation Amiga chipset (A1200, A4000 and CD32)",IDC_AGA, + CONTROL "AGA [] Advanced Graphics Architecture chipset. A1200, A4000 and CD32.",IDC_AGA, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,101,31,51,10 CONTROL "NTSC [] North American and Japanese display standard, 60Hz refresh rate. Other countries use PAL (50Hz. display refresh rate)",IDC_NTSC, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,63,50,10 - GROUPBOX "Misc chipset options",IDC_STATIC,168,11,114,82 + GROUPBOX "Options",IDC_STATIC,168,11,114,82 CONTROL "Fast Copper [] Faster but less compatible copper emulation.",IDC_FASTCOPPER, "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,176,198,98,10 CONTROL "Immediate Blitter [] Faster but less compatible blitter emulation.",IDC_BLITIMM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,30,96,10 - CONTROL "Cycle exact CPU and Blitter [] The most compatible A500 emulation mode. Very fast PC recommended.",IDC_CYCLEEXACT, + CONTROL "Cycle-exact CPU and Blitter [] The most compatible A500 emulation mode. Very fast PC recommended.",IDC_CYCLEEXACT, "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,174,43,100,10 - GROUPBOX "Collision level",IDC_STATIC,14,97,267,48 + GROUPBOX "Collision Level",IDC_STATIC,14,97,267,48 CONTROL "None [] Collision hardware emulation disabled.",IDC_COLLISION0, "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,40,113,50,10 - CONTROL "Sprites only [] Emulate only sprite vs sprite collisions.",IDC_COLLISION1, + CONTROL "Sprites only [] Emulate only sprite vs. sprite collisions.",IDC_COLLISION1, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,129,50,10 CONTROL "Sprites and Sprites vs. Playfield [] Recommended collision emulation level.",IDC_COLLISION2, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,104,113,161,10 CONTROL "Full [] 100% collision hardware emulation. Only very few games need this option. Slowest.",IDC_COLLISION3, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,104,129,82,10 - GROUPBOX "Sound emulation",IDC_STATIC,13,151,268,65 + GROUPBOX "Sound Emulation",IDC_STATIC,13,151,268,65 CONTROL "Disabled",IDC_CS_SOUND0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,39,167,102,10 CONTROL "Emulated",IDC_CS_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,182,91,10 CONTROL "Emulated, 100% accurate",IDC_CS_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,197,95,10 - CONTROL "Genlock connected [] Allow Kickstart to detect genlock. Genlock is not emulated.",IDC_GENLOCK, + CONTROL "Genlock connected [] Allow boot sequence to detect genlock. Genlock is not emulated.",IDC_GENLOCK, "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,174,56,100,10 END @@ -495,7 +499,7 @@ IDD_AVIOUTPUT DIALOGEX 0, 0, 197, 233 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Output Properties:",IDC_STATIC,5,8,184,96 + GROUPBOX "Output Properties",IDC_STATIC,5,8,184,96 EDITTEXT IDC_AVIOUTPUT_FILETEXT,26,21,120,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_CLIENTEDGE PUSHBUTTON "...",IDC_AVIOUTPUT_FILE,148,21,19,12 CONTROL "Audio",IDC_AVIOUTPUT_AUDIO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,26,36,32,11 @@ -504,16 +508,16 @@ BEGIN CONTROL "",IDC_AVIOUTPUT_VIDEO_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,60,50,107,11 CONTROL "Disable frame rate limit while recording",IDC_AVIOUTPUT_FRAMELIMITER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,68,142,10 - CONTROL "AVIOutput enabled",IDC_AVIOUTPUT_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,26,83,142,14 - GROUPBOX "Playback Rate:",IDC_STATIC,5,107,184,50 + CONTROL "AVI output enabled",IDC_AVIOUTPUT_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,26,83,142,14 + GROUPBOX "Playback Rate",IDC_STATIC,5,107,184,50 CONTROL "PAL",IDC_AVIOUTPUT_PAL,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,24,121,66,12 CONTROL "NTSC",IDC_AVIOUTPUT_NTSC,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,102,121,66,12 CONTROL "Slider1",IDC_AVIOUTPUT_FPS,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_ENABLESELRANGE | WS_TABSTOP,21,137,120,11 LTEXT "fps",IDC_AVIOUTPUT_FPS_STATIC,148,138,23,8 - PUSHBUTTON "Save Screenshot",IDC_SCREENSHOT,15,176,85,14 + PUSHBUTTON "Save screenshot",IDC_SCREENSHOT,15,176,85,14 GROUPBOX "Ripper",IDC_STATIC,5,160,184,63 PUSHBUTTON "Pro Wizard",IDC_PROWIZARD,112,176,69,14,WS_DISABLED - CONTROL "Sampleripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,15,198,84,14 + CONTROL "Sample ripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,15,198,84,14 END IDD_INPUT DIALOGEX 0, 0, 300, 242 @@ -545,34 +549,36 @@ IDD_FILTER DIALOGEX 0, 0, 296, 216 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Filter settings:",-1,0,0,294,174 + GROUPBOX "Filter Settings",-1,0,0,294,174 CONTROL "Enable",IDC_FILTERENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,17,38,10 COMBOBOX IDC_FILTERMODE,67,15,56,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTERFILTER,128,15,65,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Reset to defaults",IDC_FILTERDEFAULT,197,15,73,14 - RTEXT "Horizontal Size",-1,25,44,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,37,158,19 - EDITTEXT IDC_FILTERHZV,248,40,34,12,ES_CENTER | ES_READONLY - RTEXT "Vertical Size",-1,26,64,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,57,157,19 - EDITTEXT IDC_FILTERVZV,248,59,34,12,ES_CENTER | ES_READONLY - RTEXT "Horizontal Position",-1,26,84,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,77,157,19 - EDITTEXT IDC_FILTERHOV,248,79,34,12,ES_CENTER | ES_READONLY - RTEXT "Vertical Position",-1,26,103,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,97,157,19 - EDITTEXT IDC_FILTERVOV,248,101,34,12,ES_CENTER | ES_READONLY - RTEXT "Scanlines",-1,27,133,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERSL,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,126,157,19 - EDITTEXT IDC_FILTERSLV,248,128,34,12,ES_CENTER | ES_READONLY + RTEXT "Horizontal size:",-1,9,44,59,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,108,37,142,19 + EDITTEXT IDC_FILTERHZV,253,40,34,12,ES_CENTER | ES_READONLY + RTEXT "Vertical size:",-1,10,64,59,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,108,57,142,19 + EDITTEXT IDC_FILTERVZV,253,59,34,12,ES_CENTER | ES_READONLY + RTEXT "Horizontal position:",-1,10,84,59,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,108,77,141,19 + EDITTEXT IDC_FILTERHOV,253,79,34,12,ES_CENTER | ES_READONLY + RTEXT "Vertical position:",-1,10,103,59,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,108,99,141,19 + EDITTEXT IDC_FILTERVOV,253,101,34,12,ES_CENTER | ES_READONLY + RTEXT "Scanlines:",-1,27,133,57,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERSL,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,94,126,157,19 + EDITTEXT IDC_FILTERSLV,253,128,34,12,ES_CENTER | ES_READONLY COMBOBOX IDC_FILTERSLR,56,146,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Slider1",IDC_FILTERSL2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,146,157,19 - EDITTEXT IDC_FILTERSL2V,248,151,34,12,ES_CENTER | ES_READONLY + CONTROL "Slider1",IDC_FILTERSL2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,94,146,157,19 + EDITTEXT IDC_FILTERSL2V,253,151,34,12,ES_CENTER | ES_READONLY GROUPBOX "Presets",-1,0,176,296,36 COMBOBOX IDC_FILTERPRESETS,8,190,119,150,CBS_DROPDOWN | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Load",IDC_FILTERPRESETLOAD,132,189,47,14 PUSHBUTTON "Save",IDC_FILTERPRESETSAVE,184,189,47,14 PUSHBUTTON "Delete",IDC_FILTERPRESETDELETE,236,189,47,14 + COMBOBOX IDC_FILTERHZMULT,77,43,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTERVZMULT,77,63,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP END IDD_HARDDRIVE DIALOGEX 0, 0, 300, 66 @@ -580,26 +586,28 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS CAPTION "Harddrive Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - LTEXT "Harddrive:",-1,7,11,35,10 + LTEXT "Hard drive:",-1,7,11,35,10 COMBOBOX IDC_HARDDRIVE,49,9,246,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,50,10 - DEFPUSHBUTTON "OK",IDOK,115,30,50,14 - PUSHBUTTON "Cancel",IDCANCEL,189,30,50,14 + CONTROL "Read/write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,185,33,50,10 + DEFPUSHBUTTON "Add hard drive",IDOK,116,30,57,14 + PUSHBUTTON "Cancel",IDCANCEL,241,30,54,14 + DEFPUSHBUTTON "Create hard disk image file",IDC_HARDDRIVE_IMAGE,9,30,95,14 + EDITTEXT IDC_PATH_NAME,89,49,169,15,ES_AUTOHSCROLL | NOT WS_VISIBLE END IDD_MISC2 DIALOGEX 0, 0, 300, 92 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "When Active:",IDC_STATIC,8,7,88,73 + GROUPBOX "When Active",IDC_STATIC,8,7,88,73 RTEXT "Run at priority:",IDC_ACTIVE_PRI,14,17,45,10,SS_CENTERIMAGE | WS_TABSTOP COMBOBOX IDC_ACTIVE_PRIORITY,14,29,76,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "When Inactive:",IDC_STATIC,102,7,92,73 + GROUPBOX "When Inactive",IDC_STATIC,102,7,92,73 RTEXT "Run at priority:",IDC_INACTIVE_PRI,109,17,45,10,SS_CENTERIMAGE | WS_TABSTOP COMBOBOX IDC_INACTIVE_PRIORITY,109,29,76,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Pause emulation",IDC_INACTIVE_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,50,69,10 CONTROL "Disable sound output",IDC_INACTIVE_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,63,79,10 - GROUPBOX "When Minimized:",IDC_STATIC,199,7,92,73 + GROUPBOX "When Minimized",IDC_STATIC,199,7,92,73 RTEXT "Run at priority:",IDC_MINIMIZED_PRI,207,18,45,10,SS_CENTERIMAGE | WS_TABSTOP COMBOBOX IDC_MINIMIZED_PRIORITY,207,30,76,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Pause emulation",IDC_MINIMIZED_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,50,69,10 @@ -611,9 +619,9 @@ STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_CONTROL | DS_CENTER | DS_CE FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN CONTROL "",IDC_DISKLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,6,292,196 - PUSHBUTTON "Remove disk image",IDC_DISKLISTREMOVE,153,223,93,15 + PUSHBUTTON "Remove floppy disk image",IDC_DISKLISTREMOVE,153,223,93,15 COMBOBOX IDC_DISKTEXT,3,205,293,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Insert disk image",IDC_DISKLISTINSERT,38,223,93,15 + PUSHBUTTON "Insert floppy disk image",IDC_DISKLISTINSERT,38,223,93,15 END IDD_PANEL DIALOGEX 0, 0, 420, 278 @@ -636,22 +644,22 @@ IDD_PATHS DIALOGEX 0, 0, 300, 237 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "ROM path:",IDC_PATHS_ROML,14,9,260,8,SS_CENTERIMAGE + LTEXT "System ROMs:",IDC_PATHS_ROML,14,9,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_ROM,14,22,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_ROMS,281,22,11,15 - LTEXT "Configuration file path:",IDC_PATHS_CONFIGL,14,40,260,8,SS_CENTERIMAGE + LTEXT "Configuration files:",IDC_PATHS_CONFIGL,14,40,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_CONFIG,14,52,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_CONFIGS,281,52,11,15 - LTEXT "Screenshot path:",IDC_PATHS_SCREENSHOTL,14,71,260,8,SS_CENTERIMAGE + LTEXT "Screenshots:",IDC_PATHS_SCREENSHOTL,14,71,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_SCREENSHOT,14,83,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_SCREENSHOTS,281,83,11,15 - LTEXT "State file path:",IDC_PATHS_STATEFILEL,14,102,260,8,SS_CENTERIMAGE + LTEXT "State files:",IDC_PATHS_STATEFILEL,14,102,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_SAVESTATE,14,114,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_SAVESTATES,281,114,11,15 - LTEXT "Video path:",IDC_PATHS_AVIOUTPUTL,14,132,260,8,SS_CENTERIMAGE + LTEXT "Videos:",IDC_PATHS_AVIOUTPUTL,14,132,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_AVIOUTPUT,14,144,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_AVIOUTPUTS,282,144,11,15 - LTEXT "Saveimage path:",IDC_PATHS_SAVEIMAGEL,14,163,260,8,SS_CENTERIMAGE + LTEXT "Saveimages:",IDC_PATHS_SAVEIMAGEL,14,163,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_SAVEIMAGE,14,175,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_SAVEIMAGES,281,175,11,15 PUSHBUTTON "Reset to defaults",IDC_PATHS_DEFAULT,14,199,92,14 @@ -664,34 +672,34 @@ IDD_QUICKSTART DIALOGEX 0, 0, 300, 242 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Hardware configuration",IDC_QUICKSTART_CONFIG,3,0,294,54 + GROUPBOX "Emulated Hardware",IDC_QUICKSTART_CONFIG,3,0,294,54 RTEXT "Model:",IDC_STATIC,5,14,56,10,SS_CENTERIMAGE COMBOBOX IDC_QUICKSTART_MODEL,65,12,225,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Configuration:",IDC_STATIC,5,33,56,10,SS_CENTERIMAGE COMBOBOX IDC_QUICKSTART_CONFIGURATION,65,31,225,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Compatibility vs required CPU power ",IDC_QUICKSTART_COMPA,3,56,294,33 + GROUPBOX "Compatibility vs Required CPU Power ",IDC_QUICKSTART_COMPA,3,56,294,33 RTEXT "Best compatibility",IDC_STATIC,13,70,67,10,SS_CENTERIMAGE CONTROL "",IDC_QUICKSTART_COMPATIBILITY,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,65,115,21 RTEXT "Low compatibility",IDC_STATIC,215,70,63,10,SS_CENTERIMAGE - GROUPBOX "Host configuration",IDC_QUICKSTART_HOST,3,91,294,33 + GROUPBOX "Host Configuration",IDC_QUICKSTART_HOST,3,91,294,33 RTEXT "Configuration:",IDC_STATIC,5,105,55,10,SS_CENTERIMAGE COMBOBOX IDC_QUICKSTART_HOSTCONFIG,65,103,225,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Disk Drives",IDC_QUICKSTART_DF,3,126,294,84 - LTEXT "Disk Drive DF0:",IDC_STATIC,10,138,56,10,SS_CENTERIMAGE - PUSHBUTTON "Select Disk Image",IDC_DF0QQ,77,135,98,15 - RTEXT "Write Protected",IDC_STATIC,180,139,58,10,SS_CENTERIMAGE + GROUPBOX "Emulated Floppy Drives",IDC_QUICKSTART_DF,3,126,294,84 + LTEXT "Floppy drive DF0:",IDC_STATIC,10,138,56,10,SS_CENTERIMAGE + PUSHBUTTON "Select disk image",IDC_DF0QQ,77,135,98,15 + RTEXT "Write-protected",IDC_STATIC,180,139,58,10,SS_CENTERIMAGE CONTROL "",IDC_DF0WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,245,137,10,15 PUSHBUTTON "Eject",IDC_EJECT0Q,260,136,30,15 COMBOBOX IDC_DF0TEXTQ,9,154,282,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "Disk Drive DF1:",IDC_STATIC,10,176,56,10,SS_CENTERIMAGE - PUSHBUTTON "Select Disk Image",IDC_DF1QQ,77,172,98,15 - RTEXT "Write Protected",IDC_STATIC,180,175,58,10,SS_CENTERIMAGE + LTEXT "Floppy drive DF1:",IDC_STATIC,10,176,56,10,SS_CENTERIMAGE + PUSHBUTTON "Select disk image",IDC_DF1QQ,77,172,98,15 + RTEXT "Write-protected",IDC_STATIC,180,175,58,10,SS_CENTERIMAGE CONTROL "",IDC_DF1WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,245,173,10,15 PUSHBUTTON "Eject",IDC_EJECT1Q,260,172,30,15 COMBOBOX IDC_DF1TEXTQ,9,190,282,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Set Configuration",IDC_QUICKSTART_SETCONFIG,9,219,72,15,NOT WS_VISIBLE + PUSHBUTTON "Set configuration",IDC_QUICKSTART_SETCONFIG,9,219,72,15,NOT WS_VISIBLE GROUPBOX "Mode",IDC_STATIC,190,211,107,27,BS_LEFT - CONTROL "Start in Quickstart-mode",IDC_QUICKSTARTMODE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,199,222,94,10 + CONTROL "Start in Quickstart mode",IDC_QUICKSTARTMODE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,199,222,94,10 END IDD_FRONTEND DIALOGEX 0, 0, 420, 242 @@ -703,6 +711,58 @@ BEGIN GROUPBOX "",IDC_FE_SCREENSHOT,249,7,160,128 END +IDD_PROGRESSBAR DIALOGEX 0, 0, 229, 58 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Processing..." +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + PUSHBUTTON "Cancel",IDCANCEL,88,40,50,14 + CONTROL "",IDC_PROGRESSBAR,"msctls_progress32",WS_BORDER | 0x1,7,19,215,14 + CTEXT "x",IDC_PROGRESSBAR_TEXT,23,5,187,10,SS_CENTERIMAGE | WS_TABSTOP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_SOUND, DIALOG + BEGIN + BOTTOMMARGIN, 243 + END + + IDD_LOADSAVE, DIALOG + BEGIN + BOTTOMMARGIN, 240 + END + + IDD_CONTRIBUTORS, DIALOG + BEGIN + RIGHTMARGIN, 370 + BOTTOMMARGIN, 212 + END + + IDD_MISC1, DIALOG + BEGIN + BOTTOMMARGIN, 219 + END + + IDD_INPUT, DIALOG + BEGIN + BOTTOMMARGIN, 187 + END + + IDD_QUICKSTART, DIALOG + BEGIN + RIGHTMARGIN, 299 + END +END +#endif // APSTUDIO_INVOKED + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -766,8 +826,8 @@ IDI_PATHS ICON "paths.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,1,0 - PRODUCTVERSION 1,1,1,0 + FILEVERSION 1,2,0,0 + PRODUCTVERSION 1,2,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -783,12 +843,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "1.1.1" + VALUE "FileVersion", "1.2" VALUE "InternalName", "WinUAE" - VALUE "LegalCopyright", "© 1996-2005 under the GNU Public License (GPL)" + VALUE "LegalCopyright", "© 1996-2006 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "1.1.1" + VALUE "ProductVersion", "1.2" END END BLOCK "VarFileInfo" @@ -805,43 +865,6 @@ END IDC_MYHAND CURSOR "H_arrow.cur" -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_SOUND, DIALOG - BEGIN - BOTTOMMARGIN, 243 - END - - IDD_LOADSAVE, DIALOG - BEGIN - BOTTOMMARGIN, 240 - END - - IDD_CONTRIBUTORS, DIALOG - BEGIN - RIGHTMARGIN, 370 - BOTTOMMARGIN, 212 - END - - IDD_INPUT, DIALOG - BEGIN - BOTTOMMARGIN, 187 - END - - IDD_QUICKSTART, DIALOG - BEGIN - RIGHTMARGIN, 299 - END -END -#endif // APSTUDIO_INVOKED - - ///////////////////////////////////////////////////////////////////////////// // // Menu @@ -852,7 +875,7 @@ BEGIN POPUP "Menu" BEGIN MENUITEM "Configuration", ID_ST_CONFIGURATION - POPUP "Floppy Drives" + POPUP "Floppy drives" BEGIN MENUITEM "Eject all drives", ID_ST_EJECTALL MENUITEM "DF0:", ID_ST_DF0 @@ -866,7 +889,6 @@ BEGIN END END - ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -875,14 +897,14 @@ END STRINGTABLE BEGIN IDS_KICKSTART "ROM" - IDS_DISK "Disk Swapper" + IDS_DISK "Disk swapper" IDS_DISPLAY "Display" - IDS_HARDDISK "Hard Drives" - IDS_FLOPPY "Disk Drives" + IDS_HARDDISK "Hard drives" + IDS_FLOPPY "Disk drives" IDS_ABOUT "About" IDS_LOADSAVE "Configurations" IDS_AVIOUTPUT "Output" - IDS_PORTS "Game & I/O Ports" + IDS_PORTS "Game & I/O ports" IDS_MISC1 "Misc" IDS_MEMORY "RAM" IDS_CPU "CPU" @@ -901,7 +923,7 @@ END STRINGTABLE BEGIN - IDS_EXTTEXT "Amiga Disk Files" + IDS_EXTTEXT "Floppy disk image files" IDS_EXTACTUAL "ADF" IDS_SOUND "Sound" IDS_CDROM "CD-ROM" @@ -919,38 +941,38 @@ STRINGTABLE BEGIN IDS_NINTH "ninth " IDS_TENTH "tenth " - IDS_SELECTADF "Select an Amiga Disk File image..." - IDS_ADF "Amiga Disk Files" - IDS_CHOOSEBLANK "Choose your blank Amiga Disk File..." - IDS_SELECTHDF "Select a Hard Disk File..." - IDS_HDF "Hard Disk Files" - IDS_SELECTUAE "Select a UAE Config-File..." - IDS_UAE "UAE Config Files" - IDS_SELECTROM "Select an Amiga ROM file..." - IDS_ROM "Amiga ROM Files" - IDS_SELECTKEY "Select an Amiga Key-File..." - IDS_KEY "Amiga Kickstart Key-Files" - IDS_SELECTINFO "Select information for your config..." + IDS_SELECTADF "Select a floppy disk image file..." + IDS_ADF "Floppy disk image files" + IDS_CHOOSEBLANK "Choose a blank floppy disk image file..." + IDS_SELECTHDF "Select a hard disk image file..." + IDS_HDF "Hard disk image files" + IDS_SELECTUAE "Select a WinUAE configuration file..." + IDS_UAE "WinUAE configuration files" + IDS_SELECTROM "Select a system ROM file..." + IDS_ROM "System ROM files" + IDS_SELECTKEY "Select a system ROM key file..." + IDS_KEY "System ROM key files" + IDS_SELECTINFO "Select information for your configuration..." IDS_NONE "none" IDS_VOLUME "Volume" END STRINGTABLE BEGIN - IDS_SELECTFILESYSROOT "Please select your file-system root directory..." + IDS_SELECTFILESYSROOT "Please select the root directory of the file system..." IDS_DEFAULTMIDIOUT "Default MIDI-Out Device" IDS_CONTRIBUTORS1 "Bernd Schmidt - The Grand-Master\nSam Jordan - Custom-chip, floppy-DMA, etc.\nMathias Ortmann - Original WinUAE Main Guy, BSD Socket support\nBrian King - Picasso96 Support, Integrated GUI for WinUAE, previous WinUAE Main Guy\nToni Wilen - Core updates, WinUAE Main Guy\nGustavo Goedert/Peter Remmers/Michael Sontheimer/Tomi Hakala/Tim Gunn/Nemo Pohle - DOS Port Stuff\nSamuel Devulder/Olaf Barthel/Sam Jordan - Amiga Ports\nKrister Bergman - XFree86 and OS/2 Port\nA. Blanchard/Ernesto Corvi - MacOS Port\nChristian Bauer - BeOS Port\nIan Stephenson - NextStep Port\nPeter Teichmann - Acorn/RiscOS Port\nStefan Reinauer - ZorroII/III AutoConfig, Serial Support\nChristian Schmitt/Chris Hames - Serial Support\nHerman ten Brugge - 68020/68881 Emulation Code\nTauno Taipaleenmaki - Various UAE-Control/UAE-Library Support\nBrett Eden/Tim Gunn/Paolo Besser/Nemo Pohle - Various Docs and Web-Sites\nGeorg Veichtlbauer - Help File coordinator, German GUI\nFulvio Leonardi - Italian translator for WinUAE\n" IDS_CONTRIBUTORS2 "Bill Panagouleas - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation" IDS_INVALIDPRTPORT "The printer you have in this configuration is not valid on this machine.\n" - IDS_RESTOREUSS "Restore a UAE Snap-Shot File" - IDS_USS "UAE Snap-Shot Files" - IDS_WRONGOSVERSION "WinUAE is no longer supported on Windows NT. Please upgrade to either Windows 2000 or Windows XP." - IDS_SELECTFLASH "Select a flash/battery backed RAM file..." - IDS_FLASH "UAE flash/battery backed RAM file" - IDS_INPUTHOSTWIDGET "Input Source" - IDS_INPUTAMIGAEVENT "Input Target" + IDS_RESTOREUSS "Restore a WinUAE snapshot file" + IDS_USS "WinUAE snapshot files" + IDS_WRONGOSVERSION "WinUAE is no longer supported on Windows NT. Please upgrade to either Windows 2000 or Windows XP or a later version." + IDS_SELECTFLASH "Select a flash or battery-backed RAM file..." + IDS_FLASH "WinUAE flash or battery-backed RAM file" + IDS_INPUTHOSTWIDGET "Input source" + IDS_INPUTAMIGAEVENT "Input target" IDS_INPUTAUTOFIRE "Autofire" - IDS_SAVEUSS "Save a UAE Snap-Shot File" + IDS_SAVEUSS "Save a WinUAE snapshot file" IDS_MIDIOVERFLOW "Sysexbuffer overflow. Should not happen. Please report this to\nberndroesch1@compuserve.de" END @@ -961,15 +983,13 @@ BEGIN IDS_SECTORS "Sectors" IDS_SURFACES "Bill Panagouleas - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nHungarian translation - Péter Tóth , Balázs Rátkai , Iván Herczeg , András Arató" IDS_RESERVED "Reserved" - IDS_BLOCKSIZE "Block Size" + IDS_BLOCKSIZE "Block size" IDS_NAME "Name" IDS_DESCRIPTION "Description" - IDS_INSTALLDIRECTX "You have to install DirectX on your system before you can use UAE.\nRefer to the documentation for further details.\n" - IDS_REGKEYCREATEFAILED "WinUAE could not create Registry keys! You need administrator privileges.\n" - IDS_COULDNOTLOADCONFIG "Could not load selected configuration!\n" - IDS_NOHELP "Online help is disabled, because you have not installed the HtmlHelp system. Go to http://msdn.microsoft.com/library/tools/htmlhelp/wkshp/download.htm to get HtmlHelp.\n" + IDS_COULDNOTLOADCONFIG "Could not load the selected configuration!\n" + IDS_NOHELP "Online help is disabled because the HTML Help functionality is not installed on this system. HTML Help is available from http://www.microsoft.com/downloads/.\n" IDS_MUSTSELECTCONFIG "You must select a configuration or enter a name before selecting Load...\n" - IDS_INVALIDCOMPORT "The COM-port you have in this configuration is not valid on this machine.\n" + IDS_INVALIDCOMPORT "The COM port you have in this configuration is not valid on this machine.\n" END STRINGTABLE @@ -977,7 +997,6 @@ BEGIN IDS_HFDSIZE "Size" IDS_DEVICE "Device" IDS_BOOTPRI "BootPri" - IDS_WRONGDXVERSION "WinUAE requires DirectX 8 or newer." IDS_FLOPPY_COMPATIBLE " (compatible)" IDS_FLOPPY_TURBO "Turbo" IDS_YES "yes" @@ -986,17 +1005,16 @@ BEGIN IDS_PRI_NORMAL "Normal" IDS_PRI_BELOWNORMAL "Below Normal" IDS_PRI_LOW "Low" - IDS_OLDRTGLIBRARY "Your LIBS:Picasso96/rtg.library (%d.%d) requires updating.\nReplace it with version from ""Amiga Programs""-directory in WinUAE archive.\nNew library fixes graphics problems and increases performance." - IDS_DEFAULT_AF2005 "AmigaForever 2005" - IDS_DEFAULT_AF "AmigaForever (old)" + IDS_OLDRTGLIBRARY "The installed LIBS:Picasso96/rtg.library (%d.%d) file needs to be updated.\nA newer version is included in the ""Amiga Programs"" directory of the WinUAE distribution archive.\nThe new library fixes graphics problems and increases performance." + IDS_DEFAULT_AF2005 "Amiga Forever 2005" + IDS_DEFAULT_AF "Amiga Forever (old)" IDS_DEFAULT_WINUAE "WinUAE default" END STRINGTABLE BEGIN - IDS_WSOCK2NEEDED "Please upgrade to Winsock2.\n" IDS_UNSUPPORTEDPIXELFORMAT - "Error: Unsupported pixel format - use a different screen mode\n" + "Error: unsupported pixel format. Please use a different screen mode.\n" IDS_MUSTENTERNAME "You must select a configuration or enter a name before selecting Save...\n" IDS_MUSTSELECTCONFIGFORDELETE "You must select a configuration or enter a name before selecting Delete...\n" @@ -1004,14 +1022,14 @@ BEGIN "Are you sure you want to Delete this configuration?\n" IDS_DELETECONFIGTITLE "Confirm Delete" IDS_GFXCARDCHECK "WinUAE will now determine your graphic-card's 16-bit pixel format.\nYour screen will go black for two seconds, with a resolution of 640x480 @ 60Hz.\nThis procedure is necessary to properly display your Amiga software on 16-bit\ndisplay-modes, and should be done whenever you run WinUAE for the first time, or\ninstall a new graphics-card in your PC. Proceed with this test?\n" - IDS_GFXCARDTITLE "Pixel Format Detection" + IDS_GFXCARDTITLE "Pixel format detection" IDS_MUSTSELECTPATH "You must select a path!" - IDS_SETTINGSERROR "Settings Error" + IDS_SETTINGSERROR "Settings error" IDS_MUSTSELECTNAME "You must select a name for the volume!" IDS_MUSTSELECTFILE "You must select a file!" - IDS_FAILEDHARDFILECREATION "Failed to create hard-file..." - IDS_CREATIONERROR "Creation Error" - IDS_ERRORTITLE "WinUAE Message" + IDS_FAILEDHARDFILECREATION "Failed to create hard disk image file..." + IDS_CREATIONERROR "Creation error" + IDS_ERRORTITLE "WinUAE message" END STRINGTABLE @@ -1028,7 +1046,7 @@ END STRINGTABLE BEGIN - IDS_SOUND_FILTER_ON "Always on" + IDS_SOUND_FILTER_ON_A500 "Always on (pre-AGA)" IDS_INPUT_COMPATIBILITY "Compatibility mode" IDS_INPUT_CUSTOM "Configuration #%d" IDS_INPUT_COPY_DEFAULT "Default" @@ -1041,7 +1059,7 @@ BEGIN IDS_AVIOUTPUT_NOCODEC "no codec selected" IDS_DISK_IMAGENAME "Disk image" IDS_DISK_DRIVENAME "Drive" - IDS_AGA8BIT "AGA emulation requires 16 bit or higher display depth\nSwitching from 8-bit to 16-bit" + IDS_AGA8BIT "AGA emulation requires a 16-bit or higher display depth.\nSwitching from 8-bit to 16-bit." IDS_UNSUPPORTEDSCREENMODE "The selected screen mode can't be displayed in a window, because %s\nSwitching to full-screen display." IDS_UNSUPPORTEDSCREENMODE_1 @@ -1051,68 +1069,70 @@ END STRINGTABLE BEGIN IDS_UNSUPPORTEDSCREENMODE_2 - "the desktop is running in 8 bit color depth, which UAE can't use in windowed mode." + "the desktop is running in 8-bit color depth, which WinUAE can't use in windowed mode." IDS_UNSUPPORTEDSCREENMODE_3 - "the desktop is too small for the specified window size" + "the desktop is too small for the specified window size." IDS_UNSUPPORTEDSCREENMODE_4 - "you selected a Picasso96 display with a color depth different from that of the desktop and an overlay was unavailable." + "you selected an RTG (Picasso96) display with a color depth different from that of the desktop and an overlay was unavailable." IDS_FLOPPYTYPE35DD "3.5"" DD" IDS_FLOPPYTYPE35HD "3.5"" HD" IDS_FLOPPYTYPE525SD "5.25"" SD" IDS_FLOPPYTYPEDISABLED "Disabled" - IDS_STMENUNOFLOPPY "No disk inserted" + IDS_STMENUNOFLOPPY "No floppy disk inserted" IDS_TREEVIEW_HARDWARE "Hardware" IDS_TREEVIEW_HOST "Host" - IDS_TREEVIEW_MISC "Misc" + IDS_TREEVIEW_MISC "Miscellaneous" IDS_TREEVIEW_SETTINGS "Settings" - IDS_WINUAETITLE_MMB "[Mouse active - press Alt-Tab or middle-button to cancel]" - IDS_WINUAETITLE_NORMAL "[Mouse active - press Alt-Tab to cancel]" + IDS_WINUAETITLE_MMB "[Mouse active - press ALT+TAB or middle mouse button to cancel]" + IDS_WINUAETITLE_NORMAL "[Mouse active - press ALT+TAB to cancel]" IDS_STARTEMULATION "Start" IDS_TREEVIEW_ABOUT "About" END STRINGTABLE BEGIN - IDS_NOHARDDRIVES "No Amiga formatted or completely empty harddrives detected." + IDS_NOHARDDRIVES "No hard disks detected that were either empty or RDB-partitioned." IDS_DEFAULT_HOST "Default Configuration" IDS_SOUND_4CHANNEL "4 Channels" IDS_HF_FS_CUSTOM "Custom" - IDS_SELECTFS "Select filesystem handler (FastFileSystem, SmartFilesystem,...)" - IDS_KEYJOY "Keyboard Layout A (Numeric keypad, 0 and 5 = fire)\nKeyboard Layout B (Cursor keys, right CTRL and ALT = fire)\nKeyboard Layout C (T=up B=down F=left H=right, left ALT = fire)\nX-Arcade (Left)\nX-Arcade (Right)" + IDS_SELECTFS "Select file system handler (FastFileSystem, SmartFilesystem, etc.)" + IDS_KEYJOY "Keyboard Layout A (Numeric keypad, 0 and 5 = Fire)\nKeyboard Layout B (Cursor keys, Right CTRL and ALT = Fire)\nKeyboard Layout C (T=Up B=Down F=Left H=Right, Left ALT = Fire)\nX-Arcade (Left)\nX-Arcade (Right)" IDS_STATEFILE_UNCOMPRESSED "Uncompressed" IDS_STATEFILE_RAMDUMP "RAM dump" IDS_STATEFILE_WAVE "Wave audio dump" IDS_SOUND_SWAP_PAULA "Paula only" IDS_SOUND_SWAP_AHI "AHI only" IDS_SOUND_SWAP_BOTH "Both" + IDS_SOUND_FILTER_ON_AGA "Always on (AGA)" + IDS_SOUND_FILTER_ON "Always on" END STRINGTABLE BEGIN - IDS_NUMSG_NEEDEXT2 "Program uses non-standard disk format. You may need to use ""Custom"" floppy instead of standard adf. This message does not appear again." - IDS_NUMSG_NOROMKEY "Could not find ROM key file." - IDS_NUMSG_KSROMCRCERROR "Kickstart checksum incorrect. You probably have a corrupted ROM image." - IDS_NUMSG_KSROMREADERROR "Error while reading Kickstart." + IDS_NUMSG_NEEDEXT2 "The software uses a non-standard floppy disk format. You may need to use a custom floppy disk image file instead of a standard one. This message will not appear again." + IDS_NUMSG_NOROMKEY "Could not find system ROM key file." + IDS_NUMSG_KSROMCRCERROR "System ROM checksum incorrect. The system ROM image file may be corrupt." + IDS_NUMSG_KSROMREADERROR "Error while reading system ROM." END STRINGTABLE BEGIN - IDS_NUMSG_NOEXTROM "No extended Kickstart ROM found." - IDS_NUMSG_MODRIP_NOTFOUND "No modules or compressed data found." + IDS_NUMSG_NOEXTROM "No extended ROM found." + IDS_NUMSG_MODRIP_NOTFOUND "No music modules or packed data found." IDS_NUMSG_MODRIP_FINISHED "Scan finished." - IDS_NUMSG_MODRIP_SAVE "Module/packed data found\n%s\nDo you want to save it?" - IDS_NUMSG_KS68020 "Your Kickstart requires a 68020 CPU or later CPU." - IDS_NUMSG_ROMNEED "You need any following ROM(s):\n\n%s\n\nCheck ROM-path in Paths-panel and click ""Rescan ROMs""-button." - IDS_NUMSG_STATEHD "WARNING: State saves do not support harddrive emulation. This message does not appear again." - IDS_NUMSG_NOCAPS "This disk image needs the S.P.S. plugin\nwhich is available from\nhttp//www.softpres.org/" - IDS_NUMSG_OLDCAPS "You need updated S.P.S. plugin\nwhich is available from\nhttp//www.softpres.org/" + IDS_NUMSG_MODRIP_SAVE "Module/packed data found\n%s\nWould you like to save it?" + IDS_NUMSG_KS68020 "The selected system ROM requires a 68020 or higher CPU." + IDS_NUMSG_ROMNEED "One of the following system ROMs is required:\n\n%s\n\nCheck the System ROM path in the Paths panel and click Rescan ROMs." + IDS_NUMSG_STATEHD "WARNING: State saves do not support hard drive emulation. This message will not appear again." + IDS_NUMSG_NOCAPS "Selected disk image needs the SPS plugin\nwhich is available from\nhttp//www.softpres.org/" + IDS_NUMSG_OLDCAPS "You need an updated SPS plugin\nwhich is available from\nhttp//www.softpres.org/" IDS_IMGCHK_BOOTBLOCKCRCERROR - "Selected disk image is not bootable (bootblock CRC error)" - IDS_IMGCHK_BOOTBLOCKNO "Selected disk image is not bootable (no bootblock)" - IDS_IMGCHK_DAMAGED "Selected disk image is damaged or unformatted" - IDS_IMGCHK_KS2 "Selected disk image requires Kickstart 2.04 or 3.0\nConfiguration updated" - IDS_IMGCHK_KS3 "Selected disk image requires Kickstart 3.0 or later\nConfiguration updated" - IDS_ROMSCANEND "ROM scan finished" + "The selected floppy disk image is not bootable (boot block checksum error)" + IDS_IMGCHK_BOOTBLOCKNO "The selected floppy disk image is not bootable (no boot block)" + IDS_IMGCHK_DAMAGED "The selected floppy disk image is damaged or unformatted" + IDS_IMGCHK_KS2 "The selected floppy disk image requires a 2.04 or later system ROM.\nThe configuration has been updated." + IDS_IMGCHK_KS3 "The selected floppy disk image requires a 3.0 or later system ROM.\nThe configuration has been updated." + IDS_ROMSCANEND "Scan of ROMs finished" END STRINGTABLE @@ -1120,12 +1140,14 @@ BEGIN IDS_ROM_AVAILABLE "available" IDS_ROM_UNAVAILABLE "unavailable" IDS_HARDDRIVESAFETYWARNING - "WARNING: Non-empty or Amiga formatted\nharddrive detected and safety test was disabled\n\nHarddrives marked with 'HD_*_' are not empty" - IDS_NUMSG_KS68EC020 "Your Kickstart requires a 68EC020 or later CPU." - IDS_ROMSCANNOROMS "No supported Kickstart ROMs detected." - IDS_NUMSG_KICKREP "You need to have a diskfile in DF0 to use the Kickstart replacement." - IDS_NUMSG_KICKREPNO "Diskfiles in DF0: is not compatible with Kickstart replacement." - IDS_NUMSG_NOROM "Could not load Kickstart ROM, trying Kickstart replacement." + "Warning: The safety test has been disabled, and non-empty hard disks were detected.\n\nHard disks marked with 'HD_*_' are not empty." + IDS_NUMSG_KS68EC020 "The selected system ROM requires a 68EC020 or higher CPU." + IDS_ROMSCANNOROMS "No supported system ROMs detected." + IDS_NUMSG_KICKREP "You need to have a floppy disk (image file) in DF0: to use the system ROM replacement." + IDS_NUMSG_KICKREPNO "The floppy disk (image file) in DF0: is not compatible with the system ROM replacement functionality." + IDS_NUMSG_NOROM "Could not load Kickstart ROM, trying system ROM replacement." + IDS_HDCLONE_OK "Hard drive image file created succesfully." + IDS_HDCLONE_FAIL "Hard drive image file creation failed, error code %d." END STRINGTABLE diff --git a/od-win32/screenshot.c b/od-win32/screenshot.c index 79065b49..4b04beab 100755 --- a/od-win32/screenshot.c +++ b/od-win32/screenshot.c @@ -1,3 +1,6 @@ + +#define PNG_SCREENSHOTS 1 + #include #include @@ -14,6 +17,10 @@ #include "direct3d.h" #include "opengl.h" +#include "png.h" + +int screenshotmode = PNG_SCREENSHOTS; + static void namesplit (char *s) { int l; @@ -145,95 +152,145 @@ oops: return 0; } +#if PNG_SCREENSHOTS > 0 + +static void pngtest_blah(png_structp png_ptr, png_const_charp message) +{ + char *name = "unknown"; + if (png_ptr != NULL && png_ptr->error_ptr != NULL) + name = png_ptr->error_ptr; + write_log ("%s: libpng warning: %s\n", name, message); +} + +static int savepng(FILE *fp) +{ + png_structp png_ptr; + png_infop info_ptr; + png_bytep *row_pointers; + int h = bi.bmiHeader.biHeight; + int w = bi.bmiHeader.biWidth; + int i; + + png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, pngtest_blah, pngtest_blah, pngtest_blah); + if (!png_ptr) + return 0; + info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) { + png_destroy_write_struct(&png_ptr, NULL); + return 0; + } + if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return 0; + } + + png_init_io(png_ptr, fp); + png_set_filter(png_ptr, 0, PNG_FILTER_NONE); + png_set_IHDR(png_ptr, info_ptr, + w, h, 8, PNG_COLOR_TYPE_RGB, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + row_pointers = xmalloc (h * sizeof(png_bytep*)); + for (i = 0; i < h; i++) { + int j = h - i - 1; + row_pointers[i] = (uae_u8*)lpvBits + j * 3 * ((w + 3) & ~3); + } + png_set_rows(png_ptr, info_ptr, row_pointers); + png_write_png(png_ptr,info_ptr, PNG_TRANSFORM_BGR, NULL); + png_destroy_write_struct(&png_ptr, &info_ptr); + return 1; +} +#endif + +static int savebmp(FILE *fp) +{ + BITMAPFILEHEADER bfh; + // write the file header, bitmap information and pixel data + bfh.bfType = 19778; + bfh.bfSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + bi.bmiHeader.biSizeImage; + bfh.bfReserved1 = 0; + bfh.bfReserved2 = 0; + bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); + if(fwrite(&bfh, 1, sizeof(BITMAPFILEHEADER), fp) < sizeof(BITMAPFILEHEADER)) + return 0; // failed to write bitmap file header + if(fwrite(&bi, 1, sizeof(BITMAPINFOHEADER), fp) < sizeof(BITMAPINFOHEADER)) + return 0; // failed to write bitmap infomation header + if(fwrite(lpvBits, 1, bi.bmiHeader.biSizeImage, fp) < bi.bmiHeader.biSizeImage) + return 0; // failed to write the bitmap + return 1; +} /* Captures the Amiga display (DirectDraw, D3D or OpenGL) surface and saves it to file as a 24bit bitmap. */ void screenshot(int mode, int doprepare) { - static int recursive; - FILE *fp = NULL; + static int recursive; + FILE *fp = NULL; - HBITMAP offscreen_bitmap = NULL; // bitmap that is converted to a DIB - HDC offscreen_dc = NULL; // offscreen DC that we can select offscreen bitmap into + HBITMAP offscreen_bitmap = NULL; // bitmap that is converted to a DIB + HDC offscreen_dc = NULL; // offscreen DC that we can select offscreen bitmap into - if(recursive) - return; + if(recursive) + return; - recursive++; + recursive++; - if (!screenshot_prepared || doprepare) { - if (!screenshot_prepare()) - goto oops; - } + if (!screenshot_prepared || doprepare) { + if (!screenshot_prepare()) + goto oops; + } - if (mode == 0) { - toclipboard (&bi, lpvBits); - } else { - char filename[MAX_DPATH]; - char extension[] = "bmp"; - char path[MAX_DPATH]; - char name[MAX_DPATH]; - char underline[] = "_"; - int number = 0; + if (mode == 0) { + toclipboard (&bi, lpvBits); + } else { + char filename[MAX_DPATH]; + char path[MAX_DPATH]; + char name[MAX_DPATH]; + char underline[] = "_"; + int number = 0; - fetch_path ("ScreenshotPath", path, sizeof (path)); - CreateDirectory (path, NULL); - name[0] = 0; - if (currprefs.dfxtype[0] >= 0) - strcpy (name, currprefs.df[0]); - if (!name[0]) - underline[0] = 0; - namesplit (name); + fetch_path ("ScreenshotPath", path, sizeof (path)); + CreateDirectory (path, NULL); + name[0] = 0; + if (currprefs.dfxtype[0] >= 0) + strcpy (name, currprefs.df[0]); + if (!name[0]) + underline[0] = 0; + namesplit (name); - while(++number < 1000) // limit 999 iterations / screenshots - { - sprintf(filename, "%s%s%s%03d.%s", path, name, underline, number, extension); - - if((fp = fopen(filename, "r")) == NULL) // does file not exist? - { - BITMAPFILEHEADER bfh; - - if((fp = fopen(filename, "wb")) == NULL) - goto oops; // error - - // write the file header, bitmap information and pixel data - bfh.bfType = 19778; - bfh.bfSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + bi.bmiHeader.biSizeImage; - bfh.bfReserved1 = 0; - bfh.bfReserved2 = 0; - bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); - - if(fwrite(&bfh, 1, sizeof(BITMAPFILEHEADER), fp) < sizeof(BITMAPFILEHEADER)) - goto oops; // failed to write bitmap file header - - if(fwrite(&bi, 1, sizeof(BITMAPINFOHEADER), fp) < sizeof(BITMAPINFOHEADER)) - goto oops; // failed to write bitmap infomation header - - if(fwrite(lpvBits, 1, bi.bmiHeader.biSizeImage, fp) < bi.bmiHeader.biSizeImage) - goto oops; // failed to write the bitmap - - fclose(fp); - - write_log("Screenshot saved as \"%s\"\n", filename); - - break; - } - - fclose(fp); - fp = NULL; - } + while(++number < 1000) // limit 999 iterations / screenshots + { + sprintf(filename, "%s%s%s%03d.%s", path, name, underline, number, screenshotmode ? "png" : "bmp"); + if((fp = fopen(filename, "rb")) == NULL) // does file not exist? + { + int ok = 0; + if((fp = fopen(filename, "wb")) == NULL) + goto oops; // error +#if PNG_SCREENSHOTS > 0 + if (screenshotmode) + ok = savepng (fp); + else +#endif + ok = savebmp (fp); + fclose(fp); + fp = NULL; + if (!ok) + goto oops; + write_log("Screenshot saved as \"%s\"\n", filename); + break; + } + fclose (fp); + fp = NULL; } + } oops: - if(fp) - fclose(fp); + if(fp) + fclose(fp); - if (doprepare) - screenshot_free(); - - recursive--; + if (doprepare) + screenshot_free(); - return; + recursive--; } diff --git a/od-win32/win32.c b/od-win32/win32.c index 9eb16f39..8f4890c6 100755 --- a/od-win32/win32.c +++ b/od-win32/win32.c @@ -1264,233 +1264,108 @@ int WIN32_InitHtmlHelp( void ) return result; } +struct winuae_lang langs[] = +{ + { LANG_AFRIKAANS, "Afrikaans" }, + { LANG_ARABIC, "Arabic" }, + { LANG_ARMENIAN, "Armenian" }, + { LANG_ASSAMESE, "Assamese" }, + { LANG_AZERI, "Azeri" }, + { LANG_BASQUE, "Basque" }, + { LANG_BELARUSIAN, "Belarusian" }, + { LANG_BENGALI, "Bengali" }, + { LANG_BULGARIAN, "Bulgarian" }, + { LANG_CATALAN, "Catalan" }, + { LANG_CHINESE, "Chinese" }, + { LANG_CROATIAN, "Croatian" }, + { LANG_CZECH, "Czech" }, + { LANG_DANISH, "Danish" }, + { LANG_DUTCH, "Dutch" }, + { LANG_ESTONIAN, "Estoanian" }, + { LANG_FAEROESE, "Faeroese" }, + { LANG_FARSI, "Farsi" }, + { LANG_FINNISH, "Finnish" }, + { LANG_FRENCH, "French" }, + { LANG_GEORGIAN, "Georgian" }, + { LANG_GERMAN, "German" }, + { LANG_GREEK, "Greek" }, + { LANG_GUJARATI, "Gujarati" }, + { LANG_HEBREW, "Hebrew" }, + { LANG_HINDI, "Hindi" }, + { LANG_HUNGARIAN, "Hungarian" }, + { LANG_ICELANDIC, "Icelandic" }, + { LANG_INDONESIAN, "Indonesian" }, + { LANG_ITALIAN, "Italian" }, + { LANG_JAPANESE, "Japanese" }, + { LANG_KANNADA, "Kannada" }, + { LANG_KASHMIRI, "Kashmiri" }, + { LANG_KAZAK, "Kazak" }, + { LANG_KONKANI, "Konkani" }, + { LANG_KOREAN, "Korean" }, + { LANG_LATVIAN, "Latvian" }, + { LANG_LITHUANIAN, "Lithuanian" }, + { LANG_MACEDONIAN, "Macedonian" }, + { LANG_MALAY, "Malay" }, + { LANG_MALAYALAM, "Malayalam" }, + { LANG_MANIPURI, "Manipuri" }, + { LANG_MARATHI, "Marathi" }, + { LANG_NEPALI, "Nepali" }, + { LANG_NORWEGIAN, "Norwegian" }, + { LANG_ORIYA, "Oriya" }, + { LANG_POLISH, "Polish" }, + { LANG_PORTUGUESE, "Portuguese" }, + { LANG_PUNJABI, "Punjabi" }, + { LANG_ROMANIAN, "Romanian" }, + { LANG_RUSSIAN, "Russian" }, + { LANG_SANSKRIT, "Sanskrit" }, + { LANG_SINDHI, "Sindhi" }, + { LANG_SLOVAK, "Slovak" }, + { LANG_SLOVENIAN, "Slovenian" }, + { LANG_SPANISH, "Spanish" }, + { LANG_SWAHILI, "Swahili" }, + { LANG_SWEDISH, "Swedish" }, + { LANG_TAMIL, "Tamil" }, + { LANG_TATAR, "Tatar" }, + { LANG_TELUGU, "Telugu" }, + { LANG_THAI, "Thai" }, + { LANG_TURKISH, "Turkish" }, + { LANG_UKRAINIAN, "Ukrainian" }, + { LANG_UZBEK, "Uzbek" }, + { LANG_VIETNAMESE, "Vietnamese" }, + { LANG_ENGLISH, "default" }, + { 0x400, "guidll.dll"}, + { 0, NULL } +}; +static char *getlanguagename(DWORD id) +{ + int i; + for (i = 0; langs[i].name; i++) { + if (langs[i].id == id) + return langs[i].name; + } + return NULL; +} + typedef LANGID (CALLBACK* PGETUSERDEFAULTUILANGUAGE)(void); static PGETUSERDEFAULTUILANGUAGE pGetUserDefaultUILanguage; -static HMODULE LoadGUI( void ) +HMODULE language_load(WORD language) { HMODULE result = NULL; - LPCTSTR dllname = NULL; char dllbuf[MAX_DPATH]; - LANGID language; - - /* new user-specific Windows ME/2K/XP method to get UI language */ - pGetUserDefaultUILanguage = (PGETUSERDEFAULTUILANGUAGE)GetProcAddress( - GetModuleHandle("kernel32.dll"), "GetUserDefaultUILanguage"); - language = GetUserDefaultLangID(); - if (pGetUserDefaultUILanguage) - language = pGetUserDefaultUILanguage(); - language &= 0x3ff; // low 9-bits form the primary-language ID - - switch( language ) - { - case LANG_AFRIKAANS: - dllname = "Afrikaans"; - break; - case LANG_ARABIC: - dllname = "Arabic"; - break; - case LANG_ARMENIAN: - dllname = "Armenian"; - break; - case LANG_ASSAMESE: - dllname = "Assamese"; - break; - case LANG_AZERI: - dllname = "Azeri"; - break; - case LANG_BASQUE: - dllname = "Basque"; - break; - case LANG_BELARUSIAN: - dllname = "Belarusian"; - break; - case LANG_BENGALI: - dllname = "Bengali"; - break; - case LANG_BULGARIAN: - dllname = "Bulgarian"; - break; - case LANG_CATALAN: - dllname = "Catalan"; - break; - case LANG_CHINESE: - dllname = "Chinese"; - break; - case LANG_CROATIAN: - dllname = "CroatianSerbian"; - break; - case LANG_CZECH: - dllname = "Czech"; - break; - case LANG_DANISH: - dllname = "Danish"; - break; - case LANG_DUTCH: - dllname = "Dutch"; - break; - case LANG_ESTONIAN: - dllname = "Estonian"; - break; - case LANG_FAEROESE: - dllname = "Faeroese"; - break; - case LANG_FARSI: - dllname = "Farsi"; - break; - case LANG_FINNISH: - dllname = "Finnish"; - break; - case LANG_FRENCH: - dllname = "French"; - break; - case LANG_GEORGIAN: - dllname = "Georgian"; - break; - case LANG_GERMAN: - dllname = "German"; - break; - case LANG_GREEK: - dllname = "Greek"; - break; - case LANG_GUJARATI: - dllname = "Gujarati"; - break; - case LANG_HEBREW: - dllname = "Hebrew"; - break; - case LANG_HINDI: - dllname = "Hindi"; - break; - case LANG_HUNGARIAN: - dllname = "Hungarian"; - break; - case LANG_ICELANDIC: - dllname = "Icelandic"; - break; - case LANG_INDONESIAN: - dllname = "Indonesian"; - break; - case LANG_ITALIAN: - dllname = "Italian"; - break; - case LANG_JAPANESE: - dllname = "Japanese"; - break; - case LANG_KANNADA: - dllname = "Kannada"; - break; - case LANG_KASHMIRI: - dllname = "Kashmiri"; - break; - case LANG_KAZAK: - dllname = "Kazak"; - break; - case LANG_KONKANI: - dllname = "Konkani"; - break; - case LANG_KOREAN: - dllname = "Korean"; - break; - case LANG_LATVIAN: - dllname = "Latvian"; - break; - case LANG_LITHUANIAN: - dllname = "Lithuanian"; - break; - case LANG_MACEDONIAN: - dllname = "Macedonian"; - break; - case LANG_MALAY: - dllname = "Malay"; - break; - case LANG_MALAYALAM: - dllname = "Malayalam"; - break; - case LANG_MANIPURI: - dllname = "Manipuri"; - break; - case LANG_MARATHI: - dllname = "Marathi"; - break; - case LANG_NEPALI: - dllname = "Nepali"; - break; - case LANG_NORWEGIAN: - dllname = "Norwegian"; - break; - case LANG_ORIYA: - dllname = "Oriya"; - break; - case LANG_POLISH: - dllname = "Polish"; - break; - case LANG_PORTUGUESE: - dllname = "Portuguese"; - break; - case LANG_PUNJABI: - dllname = "Punjabi"; - break; - case LANG_ROMANIAN: - dllname = "Romanian"; - break; - case LANG_RUSSIAN: - dllname = "Russian"; - break; - case LANG_SANSKRIT: - dllname = "Sanskrit"; - break; - case LANG_SINDHI: - dllname = "Sindhi"; - break; - case LANG_SLOVAK: - dllname = "Slovak"; - break; - case LANG_SLOVENIAN: - dllname = "Slovenian"; - break; - case LANG_SPANISH: - dllname = "Spanish"; - break; - case LANG_SWAHILI: - dllname = "Swahili"; - break; - case LANG_SWEDISH: - dllname = "Swedish"; - break; - case LANG_TAMIL: - dllname = "Tamil"; - break; - case LANG_TATAR: - dllname = "Tatar"; - break; - case LANG_TELUGU: - dllname = "Telugu"; - break; - case LANG_THAI: - dllname = "Thai"; - break; - case LANG_TURKISH: - dllname = "Turkish"; - break; - case LANG_UKRAINIAN: - dllname = "Ukrainian"; - break; - case LANG_URDU: - dllname = "Urdu"; - break; - case LANG_UZBEK: - dllname = "Uzbek"; - break; - case LANG_VIETNAMESE: - dllname = "Vietnamese"; - break; - case 0x400: - dllname = "guidll.dll"; - break; - } - - if( dllname ) + char *dllname; + + if (language <= 0) { + /* new user-specific Windows ME/2K/XP method to get UI language */ + pGetUserDefaultUILanguage = (PGETUSERDEFAULTUILANGUAGE)GetProcAddress( + GetModuleHandle("kernel32.dll"), "GetUserDefaultUILanguage"); + language = GetUserDefaultLangID(); + if (pGetUserDefaultUILanguage) + language = pGetUserDefaultUILanguage(); + language &= 0x3ff; // low 9-bits form the primary-language ID + } + dllname = getlanguagename (language); + if (dllname) { DWORD dwVersionHandle, dwFileVersionInfoSize; LPVOID lpFileVersionData = NULL; @@ -1502,7 +1377,7 @@ static HMODULE LoadGUI( void ) else sprintf (dllbuf, "%sWinUAE_%s.dll", start_path_exe, dllname); result = WIN32_LoadLibrary (dllbuf); - if( result) + if (result) { dwFileVersionInfoSize = GetFileVersionInfoSize(dllbuf, &dwVersionHandle); if (dwFileVersionInfoSize) @@ -1516,7 +1391,7 @@ static HMODULE LoadGUI( void ) fail = 0; if (VerQueryValue(lpFileVersionData, TEXT("\\"), (void **)&vsFileInfo, &uLen)) { - if( vsFileInfo && + if (vsFileInfo && HIWORD(vsFileInfo->dwProductVersionMS) == UAEMAJOR && LOWORD(vsFileInfo->dwProductVersionMS) == UAEMINOR && HIWORD(vsFileInfo->dwProductVersionLS) == UAESUBREV) @@ -1535,15 +1410,16 @@ static HMODULE LoadGUI( void ) } } } - if (fail) - write_log ("Translation DLL '%s' failed to load, error %d\n", dllbuf, GetLastError ()); - if( result && !success ) - { - FreeLibrary( result ); + if (fail) { + DWORD err = GetLastError(); + if (err != 126) + write_log ("Translation DLL '%s' failed to load, error %d\n", dllbuf, GetLastError ()); + } + if (result && !success) { + FreeLibrary(result); result = NULL; } } - return result; } @@ -1566,8 +1442,20 @@ static void pritransla (void) } } -/* try to load COMDLG32 and DDRAW, initialize csDraw */ -int WIN32_InitLibraries( void ) +static void WIN32_InitLang(void) +{ + WORD langid = -1; + if (hWinUAEKey) { + DWORD regkeytype; + DWORD regkeysize = sizeof(langid); + RegQueryValueEx (hWinUAEKey, "Language", 0, ®keytype, (LPBYTE)&langid, ®keysize); + } + hUIDLL = language_load(langid); + pritransla (); +} + + /* try to load COMDLG32 and DDRAW, initialize csDraw */ +static int WIN32_InitLibraries( void ) { int result = 1; /* Determine our processor speed and capabilities */ @@ -1579,9 +1467,6 @@ int WIN32_InitLibraries( void ) hRichEdit = LoadLibrary ("RICHED32.DLL"); - hUIDLL = LoadGUI(); - pritransla (); - return result; } @@ -2413,6 +2298,7 @@ static void getstartpaths(int start_data) extern void test (void); +extern int screenshotmode; static int PASCAL WinMain2 (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) @@ -2466,6 +2352,7 @@ static int PASCAL WinMain2 (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR if (!strcmp (arg, "-scsilog")) log_scsi = 1; if (!strcmp (arg, "-nomultidisplay")) multi_display = 0; if (!strcmp (arg, "-legacypaths")) start_data = -1; + if (!strcmp (arg, "-screenshotbmp")) screenshotmode = 0; if (!strcmp (arg, "-datapath") && i + 1 < argc) { strcpy(start_path_data, argv[i + 1]); start_data = 1; @@ -2512,6 +2399,7 @@ static int PASCAL WinMain2 (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR default_freq = 60; } WIN32_HandleRegistryStuff(); + WIN32_InitLang(); WIN32_InitHtmlHelp(); DirectDraw_Release(); betamessage (); diff --git a/od-win32/win32.h b/od-win32/win32.h index 27555318..5bd2e591 100755 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -22,7 +22,7 @@ extern int manual_palette_refresh_needed; extern int mouseactive, focus; extern int ignore_messages_all; #define WINUAEBETA 1 -#define WINUAEBETASTR " Beta 5" +#define WINUAEBETASTR " Beta 6" extern char start_path_exe[MAX_DPATH]; extern char start_path_data[MAX_DPATH]; @@ -102,5 +102,12 @@ HMODULE WIN32_LoadLibrary (const char *); extern int screenshot_prepare(void); extern void screenshot_free(void); +struct winuae_lang +{ + WORD id; + char *name; +}; +extern struct winuae_lang langs[]; +extern HMODULE language_load(WORD language); #endif \ No newline at end of file diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c index 66ee3c05..fa675a99 100755 --- a/od-win32/win32gui.c +++ b/od-win32/win32gui.c @@ -80,6 +80,7 @@ #define CONFIG_HARDWARE "Hardware" static int allow_quit; +static int restart_requested; static int full_property_sheet = 1; static struct uae_prefs *pguiprefs; struct uae_prefs workprefs; @@ -4315,7 +4316,7 @@ static INT_PTR CALLBACK KickstartDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP static void enable_for_miscdlg (HWND hDlg) { - if( !full_property_sheet ) + if(!full_property_sheet) { EnableWindow (GetDlgItem (hDlg, IDC_JULIAN), TRUE); EnableWindow (GetDlgItem (hDlg, IDC_CTRLF11), TRUE); @@ -4335,6 +4336,7 @@ static void enable_for_miscdlg (HWND hDlg) EnableWindow (GetDlgItem (hDlg, IDC_STATE_CAPTURE), FALSE); EnableWindow (GetDlgItem (hDlg, IDC_STATE_RATE), FALSE); EnableWindow (GetDlgItem (hDlg, IDC_STATE_BUFFERSIZE), FALSE); + EnableWindow (GetDlgItem (hDlg, IDC_LANGUAGE), FALSE); } else { #if !defined (BSDSOCKET) EnableWindow (GetDlgItem(hDlg, IDC_SOCKETS), FALSE); @@ -4409,6 +4411,64 @@ static void misc_scsi(HWND hDlg) SendDlgItemMessage (hDlg, IDC_SCSIMODE, CB_SETCURSEL, workprefs.win32_uaescsimode, 0); } +static void misc_lang(HWND hDlg) +{ + int i, idx = 0, cnt = 0; + WORD langid = -1; + + if (hWinUAEKey) { + DWORD regkeytype; + DWORD regkeysize = sizeof(langid); + RegQueryValueEx (hWinUAEKey, "Language", 0, ®keytype, (LPBYTE)&langid, ®keysize); + } + SendDlgItemMessage (hDlg, IDC_LANGUAGE, CB_RESETCONTENT, 0, 0); + SendDlgItemMessage (hDlg, IDC_LANGUAGE, CB_ADDSTRING, 0, (LPARAM)"Autodetect"); + SendDlgItemMessage (hDlg, IDC_LANGUAGE, CB_ADDSTRING, 0, (LPARAM)"English (build-in)"); + if (langid == 0) + idx = 1; + cnt = 2; + for (i = 0; langs[i].name; i++) { + HMODULE hm = language_load (langs[i].id); + if (hm) { + FreeLibrary (hm); + SendDlgItemMessage (hDlg, IDC_LANGUAGE, CB_ADDSTRING, 0, (LPARAM)langs[i].name); + if (langs[i].id == langid) + idx = cnt; + cnt++; + } + } + SendDlgItemMessage (hDlg, IDC_LANGUAGE, CB_SETCURSEL, idx, 0); +} +static void misc_setlang(int v) +{ + int i; + WORD langid = 0; + v-=2; + if (v >= 0) { + for (i = 0; langs[i].name; i++) { + HMODULE hm = language_load (langs[i].id); + if (hm) { + FreeLibrary(hm); + if (v == 0) { + langid = langs[i].id; + break; + } + v--; + } + } + } + if (v == -2) + langid = -1; + if (hWinUAEKey) + RegSetValueEx (hWinUAEKey, "Language", 0, REG_DWORD, (CONST BYTE *)&langid, sizeof(langid)); + FreeLibrary(hUIDLL); + hUIDLL = NULL; + if (langid >= 0) + hUIDLL = language_load(langid); + restart_requested = 1; + exit_gui(0); +} + static void values_to_miscdlg (HWND hDlg) { char txt[100]; @@ -4462,6 +4522,7 @@ static void values_to_miscdlg (HWND hDlg) SendDlgItemMessage( hDlg, IDC_STATE_BUFFERSIZE, WM_SETTEXT, 0, (LPARAM)txt); misc_scsi(hDlg); + misc_lang(hDlg); } else if (currentpage == MISC2_ID) { @@ -4518,6 +4579,13 @@ static INT_PTR MiscDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) if (v != CB_ERR) workprefs.win32_uaescsimode = v; break; + case IDC_LANGUAGE: + if (HIWORD (wParam) == CBN_SELENDOK) { + v = SendDlgItemMessage(hDlg, IDC_LANGUAGE, CB_GETCURSEL, 0, 0L); + if (v != CB_ERR) + misc_setlang(v); + } + break; } } } else if (currentpage == MISC2_ID) { @@ -7548,7 +7616,7 @@ static void makefilter(char *s, int x, int flags) strcat (s, " (32bit)"); } -static char *filtermultnames[] = { "1", "2", "4", "6", "8", NULL }; +static char *filtermultnames[] = { "1x", "2x", "4x", "6x", "8x", NULL }; static int filtermults[] = { 1000, 500, 250, 167, 125 }; static void values_to_hw3ddlg (HWND hDlg) { @@ -8940,7 +9008,12 @@ int gui_init (void) int ret; read_rom_list(); - ret = GetSettings(1, currprefs.win32_notaskbarbutton ? hHiddenWnd : GetDesktopWindow()); + for (;;) { + ret = GetSettings(1, currprefs.win32_notaskbarbutton ? hHiddenWnd : GetDesktopWindow()); + if (!restart_requested) + break; + restart_requested = 0; + } if (ret > 0) { #ifdef AVIOUTPUT AVIOutput_Begin (); diff --git a/od-win32/winuae_msvc/winuae_msvc.vcproj b/od-win32/winuae_msvc/winuae_msvc.vcproj index 699eb2af..80343c02 100755 --- a/od-win32/winuae_msvc/winuae_msvc.vcproj +++ b/od-win32/winuae_msvc/winuae_msvc.vcproj @@ -84,7 +84,7 @@