From 087750f62dbd1cd16c29fa8b763fcfcb77dcc5c7 Mon Sep 17 00:00:00 2001 From: feos-tas Date: Wed, 27 Jan 2016 19:01:36 +0000 Subject: [PATCH] removed access to pal filter until it's done. --- trunk/src/drivers/win/res.rc | 24 ++++++++++++------------ trunk/src/drivers/win/video.cpp | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/trunk/src/drivers/win/res.rc b/trunk/src/drivers/win/res.rc index 71310d49..4b1b04a0 100644 --- a/trunk/src/drivers/win/res.rc +++ b/trunk/src/drivers/win/res.rc @@ -361,19 +361,19 @@ BEGIN CTEXT "Tint",65463,123,34,85,8 CONTROL "Force Grayscale",CHECK_PALETTE_GRAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,67,85,12 CONTROL "Use Custom Palette",CHECK_PALETTE_CUSTOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,22,85,12 - GROUPBOX "PAL Emulation",IDC_STATIC,10,89,208,61 - CONTROL "",CTL_PALSAT_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,78,110,70,15 - LTEXT "Saturation:",STATIC_SATVALUE,83,100,58,8 - PUSHBUTTON "Reset",BTN_PALETTE_RESET,161,132,50,14 - CONTROL "",CTL_PALNOTCH_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,11,110,68,15 - LTEXT "Notch:",STATIC_NOTCHVALUE,16,100,46,8 - CONTROL "",CTL_PALSHARP_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,156,109,61,15 - LTEXT "Sharpness:",STATIC_SHARPVALUE,161,99,50,8 + GROUPBOX "PAL Emulation",IDC_STATIC,10,89,208,61,WS_DISABLED + CONTROL "",CTL_PALSAT_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_DISABLED | WS_TABSTOP,78,110,70,15 + LTEXT "Saturation:",STATIC_SATVALUE,83,100,58,8,WS_DISABLED + PUSHBUTTON "Reset",BTN_PALETTE_RESET,161,132,50,14,WS_DISABLED + CONTROL "",CTL_PALNOTCH_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_DISABLED | WS_TABSTOP,11,110,68,15 + LTEXT "Notch:",STATIC_NOTCHVALUE,16,100,46,8,WS_DISABLED + CONTROL "",CTL_PALSHARP_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_DISABLED | WS_TABSTOP,156,109,61,15 + LTEXT "Sharpness:",STATIC_SHARPVALUE,161,99,50,8,WS_DISABLED LTEXT "NTSC Color Emulation overrides Internal default Palette.\nIndividual Game Palette overrides Internal+NTSC Palettes.\nCustom Palette overrides all of the above.\nPAL Emulation overrides other choices when PAL filter is selected",IDC_STATIC,10,156,208,33 - CONTROL "",CTL_PALCONTRAST_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,11,134,67,15 - LTEXT "Contrast: ",STATIC_CONTRASTVALUE,16,126,55,8 - CONTROL "",CTL_PALBRIGHT_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_TABSTOP,78,133,70,15 - LTEXT "Brightness: ",STATIC_BRIGHTVALUE,83,125,61,8 + CONTROL "",CTL_PALCONTRAST_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_DISABLED | WS_TABSTOP,11,134,67,15 + LTEXT "Contrast: ",STATIC_CONTRASTVALUE,16,126,55,8,WS_DISABLED + CONTROL "",CTL_PALBRIGHT_TRACKBAR,"msctls_trackbar32",TBS_NOTICKS | WS_DISABLED | WS_TABSTOP,78,133,70,15 + LTEXT "Brightness: ",STATIC_BRIGHTVALUE,83,125,61,8,WS_DISABLED END POWERPADDIALOG DIALOG 30, 123, 131, 119 diff --git a/trunk/src/drivers/win/video.cpp b/trunk/src/drivers/win/video.cpp index f7d670c2..b1294575 100644 --- a/trunk/src/drivers/win/video.cpp +++ b/trunk/src/drivers/win/video.cpp @@ -1259,7 +1259,7 @@ BOOL CALLBACK VideoConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara //CheckRadioButton(hwndDlg,IDC_RADIO_SCALE,IDC_RADIO_STRETCH,(vmodes[0].flags&VMDF_STRFS)?IDC_RADIO_STRETCH:IDC_RADIO_SCALE); // -Video Modes Tag- - char *str[]={"","hq2x","Scale2x","NTSC 2x","hq3x","Scale3x","Prescale2x","Prescale3x","Prescale4x","PAL"}; + char *str[]={"","hq2x","Scale2x","NTSC 2x","hq3x","Scale3x","Prescale2x","Prescale3x","Prescale4x"};//,"PAL"}; int x; for(x=0;x<10;x++) {