diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index a02db3658e..fb377bc98b 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -105,10 +105,6 @@ IDB_LOGOGL BITMAP "res\\logo-ogl.bmp" IDB_NULL BITMAP "res\\logo-null.bmp" -IDB_PSX_LOGO11 BITMAP "res\\psx-logo11.bmp" - -IDB_PSX_NULL BITMAP "res\\psx-logo-null.bmp" - ///////////////////////////////////////////////////////////////////////////// // @@ -256,31 +252,31 @@ BEGIN COMBOBOX IDC_COLORSPACE,102,47,48,32,CBS_DROPDOWNLIST | WS_TABSTOP END -IDD_GPUCONFIG DIALOGEX 0, 0, 189, 199 +IDD_GPUCONFIG DIALOGEX 0, 0, 243, 189 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Settings..." FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL IDB_PSX_LOGO11,IDC_PSX_LOGO11,"Static",SS_BITMAP,7,7,175,42 - CONTROL IDB_PSX_NULL,IDC_PSX_NULL,"Static",SS_BITMAP,7,7,175,42 - LTEXT "Resolution:",IDC_RESOLUTION_TEXT,7,59,37,8 - COMBOBOX IDC_RESOLUTION,80,57,102,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Renderer:",IDC_STATIC,7,74,34,8 - COMBOBOX IDC_RENDERER,80,72,102,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL IDB_LOGO11,IDC_LOGO11,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44 + CONTROL IDB_NULL,IDC_NULL,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44 + LTEXT "Renderer:",IDC_STATIC,7,59,34,8 + COMBOBOX IDC_RENDERER,105,57,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Resolution:",IDC_RESOLUTION_TEXT,7,74,37,8 + COMBOBOX IDC_RESOLUTION,105,72,127,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Texture Filter (Del):",IDC_STATIC,7,90,64,8 - COMBOBOX IDC_FILTER,80,87,102,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTER,105,87,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Dithering (End):",IDC_STATIC,7,105,52,8 - COMBOBOX IDC_DITHERING,80,102,102,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DITHERING,105,102,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Aspect Ratio (PgDn):",IDC_STATIC,7,120,68,8 - COMBOBOX IDC_ASPECTRATIO,80,117,102,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Extra Rend. Threads:",IDC_STATIC,7,157,70,8 - EDITTEXT IDC_SWTHREADS_EDIT,80,155,35,13,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,161,11,14 - DEFPUSHBUTTON "OK",IDOK,41,178,50,14 - PUSHBUTTON "Cancel",IDCANCEL,98,178,50,14 + COMBOBOX IDC_ASPECTRATIO,105,117,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Internal Resolution:",IDC_STATIC,7,135,64,8 - COMBOBOX IDC_SCALE,80,132,102,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,157,49,10 + COMBOBOX IDC_SCALE,105,132,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,49,10 + LTEXT "Extra Rend. Threads:",IDC_STATIC,106,150,70,8 + EDITTEXT IDC_SWTHREADS_EDIT,198,147,34,13,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,0,0,11,14 + DEFPUSHBUTTON "OK",IDOK,68,168,50,14 + PUSHBUTTON "Cancel",IDCANCEL,125,168,50,14 END IDD_CONFIG DIALOGEX 0, 0, 243, 387 diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj index 0d88b07655..e443d19db0 100644 --- a/plugins/GSdx/GSdx.vcxproj +++ b/plugins/GSdx/GSdx.vcxproj @@ -293,8 +293,6 @@ - - diff --git a/plugins/GSdx/GSdx.vcxproj.filters b/plugins/GSdx/GSdx.vcxproj.filters index e31d3f4aae..651ce6306b 100644 --- a/plugins/GSdx/GSdx.vcxproj.filters +++ b/plugins/GSdx/GSdx.vcxproj.filters @@ -606,11 +606,5 @@ Resource Files - - Resource Files - - - Resource Files - \ No newline at end of file diff --git a/plugins/GSdx/PSX/GPUSettingsDlg.cpp b/plugins/GSdx/PSX/GPUSettingsDlg.cpp index 616761ebe8..ac9ba673b8 100644 --- a/plugins/GSdx/PSX/GPUSettingsDlg.cpp +++ b/plugins/GSdx/PSX/GPUSettingsDlg.cpp @@ -111,8 +111,8 @@ void GPUSettingsDlg::UpdateControls() EnableWindow(GetDlgItem(m_hWnd, IDC_RESOLUTION), !resscalenotsupported); EnableWindow(GetDlgItem(m_hWnd, IDC_RESOLUTION_TEXT), !resscalenotsupported); - ShowWindow(GetDlgItem(m_hWnd, IDC_PSX_LOGO11), dx11 ? SW_SHOW : SW_HIDE); - ShowWindow(GetDlgItem(m_hWnd, IDC_PSX_NULL), null ? SW_SHOW : SW_HIDE); + ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE); + ShowWindow(GetDlgItem(m_hWnd, IDC_NULL), null ? SW_SHOW : SW_HIDE); EnableWindow(GetDlgItem(m_hWnd, IDC_SCALE), sw); EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), sw); diff --git a/plugins/GSdx/res/psx-logo-null.bmp b/plugins/GSdx/res/psx-logo-null.bmp deleted file mode 100644 index 6aedfd732d..0000000000 Binary files a/plugins/GSdx/res/psx-logo-null.bmp and /dev/null differ diff --git a/plugins/GSdx/res/psx-logo11.bmp b/plugins/GSdx/res/psx-logo11.bmp deleted file mode 100644 index a50b2faba4..0000000000 Binary files a/plugins/GSdx/res/psx-logo11.bmp and /dev/null differ diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index 2d2d31738f..df09dbe704 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -50,17 +50,13 @@ #define IDC_SWTHREADS 2063 #define IDC_SWTHREADS_EDIT 2064 // PSX: -#define IDB_PSX_NULL 2070 -#define IDB_PSX_LOGO11 2072 -#define IDC_PSX_NULL 2073 -#define IDC_PSX_LOGO11 2075 -#define IDD_GPUCONFIG 2076 -#define IDC_ASPECTRATIO 2077 -#define IDC_DITHERING 2078 -#define IDC_WINDOWED 2079 -#define IDC_RESOLUTION_TEXT 2080 -#define IDC_RESOLUTION 2081 -#define IDC_SCALE 2082 +#define IDD_GPUCONFIG 2070 +#define IDC_ASPECTRATIO 2071 +#define IDC_DITHERING 2072 +#define IDC_WINDOWED 2073 +#define IDC_RESOLUTION_TEXT 2074 +#define IDC_RESOLUTION 2075 +#define IDC_SCALE 2076 // Capture: #define IDD_CAPTURE 2090 #define IDC_FILENAME 2091