From 615d9dcb27f9e0be2f49fbddf8c266df6051d39f Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Wed, 18 Jun 2014 12:04:50 +0300 Subject: [PATCH] 2810 --- od-win32/resources/winuae_minimal.rc | 37 +++++++++++++++++++++------- od-win32/win32.h | 4 +-- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index d8d3a5f2..d82f74f8 100644 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -131,9 +131,12 @@ BEGIN RTEXT "RTG:",IDC_STATIC,8,115,49,15,SS_CENTERIMAGE COMBOBOX IDC_SCREENMODE_RTG,61,118,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SCREENMODE_RTG2,142,118,127,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Blacker than black [] Borderblanked black is blacker than display area black.",IDC_BLACKER_THAN_BLACK,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,11,140,139,10 - CONTROL "Filtered low resolution [] When scaling hires to lores or superhires to hires, show average color of pixel instead of dropping every other pixel.",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,140,123,10 - CONTROL "Remove interlace artifacts [] Emulates interlace mode internally as progressive, removing all interlace artifacts. Not compatible with all software.",IDC_FLICKERFIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,154,139,10 + CONTROL "Blacker than black [] Borderblanked black is blacker than display area black.",IDC_BLACKER_THAN_BLACK, + "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,11,140,139,10 + CONTROL "Filtered low resolution [] When scaling hires to lores or superhires to hires, show average color of pixel instead of dropping every other pixel.",IDC_LORES_SMOOTHED, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,140,123,10 + CONTROL "Remove interlace artifacts [] Emulates interlace mode internally as progressive, removing all interlace artifacts. Not compatible with all software.",IDC_FLICKERFIXER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,154,139,10 RTEXT "Resolution:",IDC_STATIC,24,170,110,8,SS_CENTERIMAGE COMBOBOX IDC_LORES,142,169,127,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "Resolution autoswitch:",IDC_STATIC,92,190,110,8,SS_CENTERIMAGE @@ -1193,8 +1196,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,0,0 - PRODUCTVERSION 2,8,0,0 + FILEVERSION 2,8,1,0 + PRODUCTVERSION 2,8,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1210,12 +1213,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "2.8.0.0" + VALUE "FileVersion", "2.8.1.0" VALUE "InternalName", "WinUAE" - VALUE "LegalCopyright", "© 1996-2013 under the GNU Public License (GPL)" + VALUE "LegalCopyright", "© 1996-2014 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "2.8.0.0" + VALUE "ProductVersion", "2.8.1.0" END END BLOCK "VarFileInfo" @@ -1871,10 +1874,26 @@ BEGIN IDS_WSTYLE_EXTENDED "Extended" IDS_MISCLISTITEMS1 "Untrap = middle button\nShow GUI on startup\nUse CTRL-F11 to quit\nDon't show taskbar button\nDon't show notification icon\n" IDS_MISCLISTITEMS2 "Always on top\nDisable screensaver\nSynchronize clock\nFaster RTG\nClipboard sharing\nAllow native code\n" - IDS_MISCLISTITEMS3 "Native on-screen display\nRTG on-screen display\nCreate winuaelog.txt log\nLog illegal memory accesses\nBlank unused displays\nStart mouse uncaptured\nStart minimized\nMinimize when focus is lost\n" + IDS_MISCLISTITEMS3 "Native on-screen display\nRTG on-screen display\nCreate winuaelog.txt log\nLog illegal memory accesses\nBlank unused displays\nStart mouse uncaptured\nStart minimized\nMinimize when focus is lost\n100/120Hz VSync black frame insertion\nMaster floppy write protection\nHide all UAE autoconfig boards\n" IDS_JOYMODE_WHEELMOUSE "Wheel Mouse" IDS_NUMSG_KS68030PLUS "The selected system ROM requires a 68030 or higher CPU." IDS_SELECTTAPE "Select a Tape directory or archive file..." + IDS_SCREEN_NATIVE "Native" + IDS_SCREEN_RTG "RTG" + IDS_DISPLAYMODE_NATIVE "Native" + IDS_CURRENT_CONFIGURATION "Current Configuration" + IDS_SELECT_MENU "Select" + IDS_SCSI_EMULATION "SCSI Emulation *" + IDS_SLIRP "SLIRP User Mode NAT" + IDS_SLIRP_INBOUND "SLIRP + Open ports (21-23,80)" +END + +STRINGTABLE +BEGIN + IDS_FILTER_PAL_EXTRA "Brightness\nContrast\nSaturation\nGamma\nScanlines\nBlurriness\nNoise\n" + IDS_FILTER_3D_EXTRA "Point/Bilinear\nScanline opacity\nScanline level\n" + IDS_ALWAYS_ON "Always on" + IDS_DISPLAY_ATTRIBUTES "Brightness\nContrast\nGamma" END #endif // English resources diff --git a/od-win32/win32.h b/od-win32/win32.h index 1159ee9f..c3c0f03a 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,7 +15,7 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEPUBLICBETA 1 +#define WINUAEPUBLICBETA 0 #define LANG_DLL 1 #define LANG_DLL_FULL_VERSION_MATCH 0 @@ -25,7 +25,7 @@ #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2014, 6, 16) +#define WINUAEDATE MAKEBD(2014, 6, 18) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") -- 2.47.3