]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
resource dll
authorToni Wilen <twilen@winuae.net>
Wed, 28 Apr 2010 15:12:58 +0000 (18:12 +0300)
committerToni Wilen <twilen@winuae.net>
Wed, 28 Apr 2010 15:12:58 +0000 (18:12 +0300)
od-win32/resources/winuae_minimal.rc

index e5fa5dbb75ce0dcb8dd734aedc9a248652080f68..0c6f608cff73888c63b9a1075f764e75d7b178f9 100644 (file)
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (Neutral) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -59,7 +57,7 @@ IDI_EXPANSION           ICON                    "expansion.ico"
 // Accelerator
 //
 
-IDR_DBGACCEL ACCELERATORS 
+IDR_DBGACCEL ACCELERATORS
 BEGIN
     VK_F1,          ID_DBG_PAGE1,           VIRTKEY, NOINVERT
     VK_F2,          ID_DBG_PAGE2,           VIRTKEY, NOINVERT
@@ -198,7 +196,8 @@ BEGIN
     GROUPBOX        "CPU Emulation Speed",IDC_STATIC,90,3,205,92
     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
+    CONTROL         "Approximate A500 or A500/A1200 cycle-exact",IDC_CS_68000,
+                    "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,95,32,195,10
     CONTROL         "Adjustable between CPU and chipset",IDC_CS_ADJUSTABLE,
                     "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,95,46,195,10
     CONTROL         "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,114,71,67,20
@@ -373,7 +372,7 @@ IDD_IOPORTS DIALOGEX 0, 0, 300, 228
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Parallel Port",IDC_STATIC,5,2,291,86
+    GROUPBOX        "Parallel Port",IDC_STATIC,5,2,291,105
     RTEXT           "Printer:",IDC_STATIC,12,15,25,15,SS_CENTERIMAGE
     COMBOBOX        IDC_PRINTERLIST,49,15,232,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Flush print job",IDC_FLUSHPRINTER,114,51,58,12
@@ -381,22 +380,24 @@ BEGIN
     EDITTEXT        IDC_PRINTERAUTOFLUSH,255,50,25,12,ES_NUMBER
     RTEXT           "Type:",IDC_STATIC,15,33,21,15,SS_CENTERIMAGE
     EDITTEXT        IDC_PS_PARAMS,114,67,167,12,ES_AUTOHSCROLL
-    GROUPBOX        "Serial Port",IDC_STATIC,4,92,292,48
-    COMBOBOX        IDC_SERIAL,49,104,232,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Shared",IDC_SER_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,15,123,48,12
-    CONTROL         "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,75,123,55,12
-    RTEXT           "Out:",IDC_MIDI,10,154,34,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_MIDIOUTLIST,49,154,232,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "In:",IDC_MIDI2,10,174,29,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_MIDIINLIST,49,174,232,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Serial Port",IDC_STATIC,4,110,292,48
+    COMBOBOX        IDC_SERIAL,49,122,232,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Shared",IDC_SER_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,15,141,48,12
+    CONTROL         "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,75,141,55,12
+    RTEXT           "Out:",IDC_MIDI,10,172,19,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_MIDIOUTLIST,36,173,108,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "In:",IDC_MIDI2,150,171,22,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_MIDIINLIST,181,173,108,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Direct []Use when emulating serial-link games on two PCs running WinUAE",IDC_SER_DIRECT,
-                    "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,135,123,65,12
-    CONTROL         "uaeserial.device",IDC_UAESERIAL,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,200,123,78,12
+                    "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,135,141,65,12
+    CONTROL         "uaeserial.device",IDC_UAESERIAL,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,200,141,78,12
     COMBOBOX        IDC_PRINTERTYPELIST,49,33,232,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Ghostscript extra parameters:",IDC_STATIC,10,66,102,15,SS_CENTERIMAGE
-    GROUPBOX        "MIDI",IDC_STATIC,5,143,291,51,BS_LEFT
+    GROUPBOX        "MIDI",IDC_STATIC,5,161,291,34,BS_LEFT
     GROUPBOX        "Protection Dongle",IDC_STATIC,5,197,292,30,BS_LEFT
     COMBOBOX        IDC_DONGLELIST,50,208,232,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Sampler:",IDC_STATIC,12,84,31,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_SAMPLERLIST,49,85,232,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_GAMEPORTS DIALOGEX 0, 0, 300, 236
@@ -441,18 +442,18 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,45,10,210,15
     CONTROL         "",IDC_RICHEDIT2,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,30,260,13
-    PUSHBUTTON      "Contributors",IDC_CONTRIBUTORS,110,55,80,15
-    CONTROL         "",IDC_UAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,120,80,15
-    CONTROL         "",IDC_PICASSOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,90,80,20
-    CONTROL         "",IDC_AMIGAHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,109,90,80,20
-    CONTROL         "",IDC_WINUAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,120,80,15
-    CONTROL         "",IDC_AIABHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,120,80,15
-    CONTROL         "",IDC_THEROOTS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,145,80,15
-    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,63,169,80,15
-    CONTROL         "",IDC_AMIKIT,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,157,169,80,15
+    PUSHBUTTON      "Contributors",IDC_CONTRIBUTORS,110,59,80,15
+    CONTROL         "",IDC_UAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,128,80,15
+    CONTROL         "",IDC_PICASSOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | NOT WS_VISIBLE | WS_DISABLED,206,55,80,20
+    CONTROL         "",IDC_AMIGAHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,109,98,80,20
+    CONTROL         "",IDC_WINUAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,98,80,15
+    CONTROL         "",IDC_AIABHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | NOT WS_VISIBLE | WS_DISABLED,17,59,80,15
+    CONTROL         "",IDC_THEROOTS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,153,80,15
+    CONTROL         "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,128,80,15
+    CONTROL         "",IDC_ABIME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,128,80,15
+    CONTROL         "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,98,80,20
+    CONTROL         "",IDC_AMIGASYS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,153,80,15
+    CONTROL         "",IDC_AMIKIT,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,153,80,15
 END
 
 IDD_MISC1 DIALOGEX 0, 0, 300, 237
@@ -461,10 +462,10 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     GROUPBOX        "Miscellaneous Options",IDC_STATIC,8,2,290,136
     CONTROL         "Untrap = middle button",IDC_JULIAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,19,110,10
-    CONTROL         "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,31,109,10
-    CONTROL         "Native On-screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,141,80,109,10
-    CONTROL         "Don't show taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,56,109,10
-    CONTROL         "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,43,110,10
+    CONTROL         "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,43,109,10
+    CONTROL         "Native On-screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,80,109,10
+    CONTROL         "Don't show taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,67,109,10
+    CONTROL         "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,55,110,10
     GROUPBOX        "Keyboard LEDs",IDC_STATIC,7,140,85,94
     COMBOBOX        IDC_KBLED1,22,154,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_KBLED2,22,173,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -480,19 +481,22 @@ BEGIN
     COMBOBOX        IDC_STATE_RATE,248,197,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Recording buffer (MB):",IDC_STATIC,160,219,83,10,SS_CENTERIMAGE | WS_TABSTOP
     COMBOBOX        IDC_STATE_BUFFERSIZE,248,217,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,69,110,10
+    CONTROL         "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,79,110,10
     CONTROL         "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,216,64,10
     COMBOBOX        IDC_SCSIMODE,213,30,80,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_LANGUAGE,153,117,122,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Language",IDC_STATIC,138,107,154,27
-    CONTROL         "Disable screensaver",IDC_POWERSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,82,109,10
+    CONTROL         "Disable screensaver",IDC_POWERSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,91,109,10
     COMBOBOX        IDC_DD_SURFACETYPE,213,63,79,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "DirectDraw display buffer:",IDC_STATIC,195,50,92,10,SS_CENTERIMAGE
     RTEXT           "SCSI and CD/DVD access method:",IDC_STATIC,151,12,126,10,SS_CENTERIMAGE
-    CONTROL         "Synchronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,95,111,10
+    CONTROL         "Synchronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,103,111,10
     CONTROL         "Faster RTG [] Enables less accurate custom chipset emulation mode when Picasso96 is enabled.",IDC_FASTERRTG,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,19,108,100,10
-    CONTROL         "RTG On-screen LEDs",IDC_SHOWLEDSRTG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,141,93,109,10
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,19,115,100,10
+    CONTROL         "RTG On-screen LEDs",IDC_SHOWLEDSRTG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,93,109,10
+    LTEXT           "Graphics API:",IDC_STATIC,136,49,62,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_DXMODE,138,62,61,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Minimize when focus is lost",IDC_FOCUSMINIMIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,31,110,10
 END
 
 IDD_HARDFILE DIALOGEX 0, 0, 299, 249
@@ -660,7 +664,7 @@ BEGIN
     CONTROL         "CIA ROM Overlay",IDC_CS_CIAOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,95,80,10
     CONTROL         "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,159,80,10
     CONTROL         "No-EHB Denise",IDC_CS_NOEHB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,159,80,10
-    CONTROL         "Blitter Busy Bug",IDC_CS_BLITTERBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,159,80,10
+    CONTROL         "A1000 Agnus (8361)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,159,94,10
 END
 
 IDD_AVIOUTPUT DIALOGEX 0, 0, 288, 217
@@ -704,17 +708,17 @@ BEGIN
     CONTROL         "List1",IDC_INPUTLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,22,290,146
     COMBOBOX        IDC_INPUTAMIGACNT,5,174,24,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_INPUTAMIGA,33,174,262,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Joystick dead zone (%):",-1,7,196,79,10,SS_CENTERIMAGE
-    EDITTEXT        IDC_INPUTDEADZONE,92,195,25,12,ES_NUMBER
-    RTEXT           "Autofire rate (frames):",-1,10,212,76,10,SS_CENTERIMAGE
-    EDITTEXT        IDC_INPUTAUTOFIRERATE,92,210,25,12,ES_NUMBER
-    RTEXT           "Digital joy-mouse speed:",-1,124,196,84,10,SS_CENTERIMAGE
-    EDITTEXT        IDC_INPUTSPEEDD,215,195,25,12,ES_NUMBER
-    RTEXT           "Analog joy-mouse speed:",-1,120,212,88,10,SS_CENTERIMAGE
-    EDITTEXT        IDC_INPUTSPEEDA,215,211,25,12,ES_NUMBER
-    PUSHBUTTON      "Copy from:",IDC_INPUTCOPY,249,195,45,14
-    COMBOBOX        IDC_INPUTCOPYFROM,249,211,45,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Swap 1<>2",IDC_INPUTSWAP,249,226,45,14
+    RTEXT           "Joystick dead zone (%):",-1,4,196,79,10,SS_CENTERIMAGE
+    EDITTEXT        IDC_INPUTDEADZONE,88,195,25,12,ES_NUMBER
+    RTEXT           "Autofire rate (frames):",-1,4,212,79,10,SS_CENTERIMAGE
+    EDITTEXT        IDC_INPUTAUTOFIRERATE,88,210,25,12,ES_NUMBER
+    RTEXT           "Digital joy-mouse speed:",-1,117,196,88,10,SS_CENTERIMAGE
+    EDITTEXT        IDC_INPUTSPEEDD,210,195,25,12,ES_NUMBER
+    RTEXT           "Analog joy-mouse speed:",-1,117,212,88,10,SS_CENTERIMAGE
+    EDITTEXT        IDC_INPUTSPEEDA,210,211,25,12,ES_NUMBER
+    PUSHBUTTON      "Copy from:",IDC_INPUTCOPY,240,195,56,14
+    COMBOBOX        IDC_INPUTCOPYFROM,240,211,55,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Swap 1<>2",IDC_INPUTSWAP,240,226,56,14
 END
 
 IDD_FILTER DIALOGEX 0, 0, 296, 241
@@ -742,7 +746,7 @@ BEGIN
     EDITTEXT        IDC_FILTERXLV,253,176,34,12,ES_CENTER | ES_READONLY
     COMBOBOX        IDC_FILTERSLR,253,151,33,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Presets",-1,0,203,296,36
-    COMBOBOX        IDC_FILTERPRESETS,8,217,119,150,CBS_DROPDOWN | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERPRESETS,8,217,119,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Load",IDC_FILTERPRESETLOAD,132,216,47,14
     PUSHBUTTON      "Save",IDC_FILTERPRESETSAVE,184,216,47,14
     PUSHBUTTON      "Delete",IDC_FILTERPRESETDELETE,236,216,47,14
@@ -751,9 +755,9 @@ BEGIN
     COMBOBOX        IDC_FILTERXTRA,105,151,138,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTERASPECT,14,151,73,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Keep aspect ratio",IDC_FILTERKEEPASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,14,168,85,10
-    RTEXT           "Automatic scaling:",-1,9,38,79,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_FILTERAUTOSCALE,105,36,140,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERAUTOSCALE,132,36,83,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTERASPECT2,14,180,73,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTEROVERLAY,20,36,103,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_HARDDRIVE DIALOGEX 0, 0, 380, 76
@@ -871,22 +875,23 @@ BEGIN
     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        "Emulated Floppy Drives",IDC_QUICKSTART_DF,3,126,294,84
-    CONTROL         "Floppy drive DF0:",IDC_DF0QENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,10,136,72,15
-    PUSHBUTTON      "Select disk image",IDC_DF0QQ,85,136,98,15
-    RTEXT           "Write-protected",IDC_STATIC,185,139,56,10,SS_CENTERIMAGE
+    GROUPBOX        "Emulated Drives",IDC_QUICKSTART_DF,3,126,294,84
+    CONTROL         "Floppy drive DF0:",IDC_DF0QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,136,72,15
+    PUSHBUTTON      "Select image file",IDC_DF0QQ,85,136,98,15
+    RTEXT           "Write-protected",IDC_DF0WPTEXTQ,185,139,56,10,SS_CENTERIMAGE
     CONTROL         "",IDC_DF0WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,246,137,10,15
     PUSHBUTTON      "Eject",IDC_EJECT0Q,261,136,30,15
     COMBOBOX        IDC_DF0TEXTQ,9,154,282,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Floppy drive DF1:",IDC_DF1QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,172,71,15
-    PUSHBUTTON      "Select disk image",IDC_DF1QQ,85,172,98,15
-    RTEXT           "Write-protected",IDC_STATIC,185,175,55,10,SS_CENTERIMAGE
+    PUSHBUTTON      "Select image file",IDC_DF1QQ,85,172,98,15
+    RTEXT           "Write-protected",IDC_DF1WPTEXTQ,185,175,55,10,SS_CENTERIMAGE
     CONTROL         "",IDC_DF1WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,246,173,10,15
     PUSHBUTTON      "Eject",IDC_EJECT1Q,261,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
     GROUPBOX        "Mode",IDC_STATIC,190,211,107,27,BS_LEFT
     CONTROL         "Start in Quickstart mode",IDC_QUICKSTARTMODE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,197,222,94,10
+    COMBOBOX        IDC_CD0Q_TYPE,191,173,63,50,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_FRONTEND DIALOGEX 0, 0, 420, 242
@@ -1007,8 +1012,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,0
- PRODUCTVERSION 2,0,1,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1024,12 +1029,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "2.0.1"
+            VALUE "FileVersion", "2.1.0.0"
             VALUE "InternalName", "WinUAE"
-            VALUE "LegalCopyright", "© 1996-2009 under the GNU Public License (GPL)"
+            VALUE "LegalCopyright", "© 1996-2010 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "2.0.1"
+            VALUE "ProductVersion", "2.1.0.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1051,7 +1056,7 @@ IDC_MYHAND              CURSOR                  "H_arrow.cur"
 // Menu
 //
 
-IDM_SYSTRAY MENU 
+IDM_SYSTRAY MENU
 BEGIN
     POPUP "Menu"
     BEGIN
@@ -1070,7 +1075,7 @@ BEGIN
     END
 END
 
-IDM_DBGCONTEXTMENU MENU 
+IDM_DBGCONTEXTMENU MENU
 BEGIN
     POPUP "Inactive"
     BEGIN
@@ -1120,19 +1125,50 @@ BEGIN
     END
 END
 
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
+    IDD_CPU, DIALOG
+    BEGIN
+    END
+
+    IDD_IOPORTS, DIALOG
+    BEGIN
+    END
+
+    IDD_GAMEPORTS, DIALOG
+    BEGIN
+    END
+
+    IDD_MISC1, DIALOG
+    BEGIN
+    END
+
+    IDD_INPUT, DIALOG
+    BEGIN
+    END
+
     IDD_FILTER, DIALOG
     BEGIN
         BOTTOMMARGIN, 237
     END
+
+    IDD_MISC2, DIALOG
+    BEGIN
+    END
+
+    IDD_DISK, DIALOG
+    BEGIN
+    END
+
+    IDD_FRONTEND, DIALOG
+    BEGIN
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -1142,7 +1178,7 @@ END
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_KICKSTART           "ROM"
     IDS_DISK                "Disk swapper"
@@ -1161,7 +1197,7 @@ BEGIN
     IDS_FILTER              "Filter"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_MISC2               "Pri. & Extensions"
     IDS_PATHS               "Paths"
@@ -1172,7 +1208,7 @@ BEGIN
     IDS_EXPANSION           "Expansions"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_EXTTEXT             "Floppy disk image files"
     IDS_EXTACTUAL           "ADF"
@@ -1188,7 +1224,7 @@ BEGIN
     IDS_EIGHTH              "eighth "
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_NINTH               "ninth "
     IDS_TENTH               "tenth "
@@ -1208,7 +1244,7 @@ BEGIN
     IDS_VOLUME              "Volume"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_SELECTFILESYSROOT   "Please select the root directory of the file system..."
     IDS_DEFAULTMIDIOUT      "Default MIDI-Out Device"
@@ -1227,7 +1263,7 @@ BEGIN
     IDS_MIDIOVERFLOW        "Sysexbuffer overflow. Should not happen. Please report this to\nberndroesch1@compuserve.de"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_PATH                "Path"
     IDS_RW                  "R/W"
@@ -1243,7 +1279,7 @@ BEGIN
     IDS_INVALIDCOMPORT      "The serial port you have in this configuration is not valid on this machine.\n"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_HFDSIZE             "Size"
     IDS_DEVICE              "Device"
@@ -1262,7 +1298,7 @@ BEGIN
     IDS_DEFAULT_WINUAE      "WinUAE default (old)"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_SOUND_STEREO2       "Cloned Stereo (4 Channels)"
     IDS_INPUT_CUSTOMEVENT   "<Custom event>"
@@ -1273,9 +1309,12 @@ BEGIN
     IDS_ALL                 "All"
     IDS_INPUTTOGGLE         "Toggle"
     IDS_NETDISCONNECTED     "Cable disconnected"
+    IDS_QS_CD               "CD"
+    IDS_QS_CD_AUTO          "Autodetect"
+    IDS_QS_CD_IMAGE         "Image file"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_UNSUPPORTEDPIXELFORMAT 
                             "Error: unsupported pixel format. Please use a different screen mode.\n"
@@ -1294,7 +1333,7 @@ BEGIN
     IDS_ERRORTITLE          "WinUAE message"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_INP                 "WinUAE Input Recording"
     IDS_RESTOREINP          "Playback a WinUAE input recording"
@@ -1312,7 +1351,7 @@ BEGIN
     IDS_SOUND_FILTER_EMULATED "Emulated (A500)"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_SOUND_FILTER_EMULATED_E "Emulated (A1200)"
     IDS_INPUT_COMPATIBILITY "Compatibility mode"
@@ -1333,7 +1372,7 @@ BEGIN
                             "the desktop is running in an unknown color mode."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_UNSUPPORTEDSCREENMODE_2 
                             "the desktop is running in 8-bit color depth, which WinUAE can't use in windowed mode."
@@ -1356,7 +1395,7 @@ BEGIN
     IDS_TREEVIEW_ABOUT      "About"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_NOHARDDRIVES        "No hard disks detected that were either empty or RDB-partitioned."
     IDS_DEFAULT_HOST        "Default Configuration"
@@ -1376,7 +1415,7 @@ BEGIN
     IDS_FLOPPYTYPE35DDESCOM "3.5"" ESCOM"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     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."
@@ -1384,7 +1423,7 @@ BEGIN
     IDS_NUMSG_KSROMREADERROR "Error while reading system ROM."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_NUMSG_NOEXTROM      "No extended ROM found."
     IDS_NUMSG_MODRIP_NOTFOUND "No music modules or packed data found."
@@ -1404,7 +1443,7 @@ BEGIN
     IDS_ROMSCANEND          "Scan of ROMs finished"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_ROM_AVAILABLE       "available"
     IDS_ROM_UNAVAILABLE     "unavailable"
@@ -1421,7 +1460,7 @@ BEGIN
     IDS_SB_CUSTOMEVENT      "Enter custom event string.."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_QS_MODELS           "A500\nA500+\nA600\nA1000\nA1200\nA3000\nA4000\nCD32\nCDTV\nArcadia Multi Select system\nExpanded WinUAE example configuration"
     IDS_QS_MODEL_A500       "1.3 ROM, OCS, 512 KB Chip + 512 KB Slow RAM (most common)\nThis configuration is capable of running most games and demos produced for first-generation hardware. Only few exceptions need a different configuration (e.g. the oldest games tend to be incompatible with this configuration).\n1.3 ROM, ECS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nLater hardware revision of the A500. Nearly 100% compatible with the previous configuration.\n1.3 ROM, ECS Agnus, 1 MB Chip RAM\nFew newer games and demos require this configuration.\n1.3 ROM, OCS Agnus, 512 KB Chip RAM\nVery old (e.g. pre-1988) games and demos may require this configuration.\n1.2 ROM, OCS Agnus, 512 KB Chip RAM\nAs available for the A1000, and installed on the first A500 and A2000 series. Some very old programs only work correctly with this configuration. Note: This system ROM version can only boot from floppy disk (no hard disk boot support).\n1.2 ROM, OCS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nThis configuration adds expansion memory to the first A500 produced. Try this if your game does not work with newer configurations, but works with the previous one. It could add some features to the game, including faster loading times. Note: This system ROM version can only boot from floppy disk (no hard disk boot support)."
@@ -1433,7 +1472,7 @@ BEGIN
     IDS_QS_MODEL_CDTV       "CDTV\nThe CDTV was the first model with a built-in CD-ROM drive. Looking like a black CD player, it featured a configuration equivalent to that of an A500 with 1 MB RAM and an ECS chipset.\nFloppy drive and 64KB SRAM card expanded CDTV\n"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_QS_MODEL_UAE        "High-end expanded configuration"
     IDS_QS_MODEL_ARCADIA    "Arcadia\nArcadia Multi Select system is arcade platform developed by Arcadia and  Mastertronic. It is based on an A500 mainboard with ROM cage attached to expansion port. Arcadia ROM files go to ""Cartridge ROM File"" in ROM-panel."
@@ -1442,7 +1481,7 @@ BEGIN
     IDS_QS_MODEL_A4000T     "A4000T (test)\nA4000T"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_FLOPPYTYPE35DDPC    "3.5"" DD (PC)"
     IDS_FLOPPYTYPE35HDPC    "3.5"" HD (PC)"
@@ -1456,13 +1495,13 @@ BEGIN
     IDS_TABLET_BOTH_CURSORS "Show both cursors"
     IDS_TABLET_NATIVE_CURSOR "Show native cursor only"
     IDS_TABLET_HOST_CURSOR  "Show host cursor only"
-    IDS_AUTOSCALE_DISABLED  "Disabled"
+    IDS_AUTOSCALE_DISABLED  "No Autoscaling"
     IDS_AUTOSCALE_SCALING   "Automatic scaling"
     IDS_AUTOSCALE_RESIZE    "Automatic resize"
     IDS_PRINTER_ASCII       "ASCII-Only"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_PRINTER_EPSON9      "Epson Matrix Printer Emulation, 9pin"
     IDS_PRINTER_POSTSCRIPT_DETECTION "PostScript (Passthrough)"
@@ -1473,20 +1512,20 @@ BEGIN
     IDS_RES_HIRES           "Hires (normal)"
     IDS_RES_SUPERHIRES      "SuperHires"
     IDS_PRINTER_EPSON48     "Epson Matrix Printer Emulation, 48pin"
+    IDS_SELECTCD            "Select a CD image file..."
+    IDS_CD                  "CD image files"
 END
 
-#endif    // English (Neutral) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Finnish resources
+// Finnish (Finland) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FIN)
-#ifdef _WIN32
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -1511,7 +1550,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // Finnish resources
+#endif    // Finnish (Finland) resources
 /////////////////////////////////////////////////////////////////////////////