From ef58bc2a0da8f0f3259069c783a4b4a74fe97b81 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 23 Jan 2013 18:28:05 +0100 Subject: [PATCH] (Rmenu XUI) Remove menu HD/SD switch --- frontend/menu/rmenu_xui.cpp | 23 --------------------- frontend/menu/rmenu_xui.h | 1 - media/360/hd/rarch_settings.xui | 13 +++++++++++- media/360/sd/rarch_controls.xui | 2 +- media/360/sd/rarch_filebrowser.xui | 2 +- media/360/sd/rarch_libretrocore_browser.xui | 2 +- media/360/sd/rarch_main.xui | 2 +- media/360/sd/rarch_quickmenu.xui | 2 +- media/360/sd/rarch_settings.xui | 15 ++++++++++++-- media/360/sd/rarch_shader_browser.xui | 2 +- 10 files changed, 31 insertions(+), 33 deletions(-) diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index c63e8028e3..e0579b8663 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -29,7 +29,6 @@ #include "../../gfx/gfx_context.h" -#include "../../xdk/xdk_d3d.h" #include "../../message.h" #include "../../general.h" @@ -388,7 +387,6 @@ HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled) m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); - m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER_2, g_settings.video.second_pass_smooth ? L"Hardware filtering shader #2: Linear interpolation" : L"Hardware filtering shader #2: Point filtering"); @@ -461,13 +459,6 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); break; - case SETTING_EMU_MENUS: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_HD); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD); - m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD"); - break; case SETTING_GAMMA_CORRECTION_ENABLED: g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; driver.video->restart(); @@ -578,13 +569,6 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); break; - case SETTING_EMU_MENUS: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_HD); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD); - m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD"); - break; case SETTING_GAMMA_CORRECTION_ENABLED: g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; driver.video->restart(); @@ -639,13 +623,6 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro g_extern.lifecycle_mode_state |= (1ULL << MODE_FPS_DRAW); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); break; - case SETTING_EMU_MENUS: - if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) - g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU_HD); - else - g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_HD); - m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD"); - break; case SETTING_GAMMA_CORRECTION_ENABLED: g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; driver.video->restart(); diff --git a/frontend/menu/rmenu_xui.h b/frontend/menu/rmenu_xui.h index 4576cfe5b9..1a3781ddc1 100644 --- a/frontend/menu/rmenu_xui.h +++ b/frontend/menu/rmenu_xui.h @@ -26,7 +26,6 @@ enum SETTING_EMU_REWIND_GRANULARITY, SETTING_EMU_SHOW_INFO_MSG, SETTING_EMU_SHOW_DEBUG_INFO_MSG, - SETTING_EMU_MENUS, SETTING_GAMMA_CORRECTION_ENABLED, SETTING_SHADER, SETTING_SHADER_2, diff --git a/media/360/hd/rarch_settings.xui b/media/360/hd/rarch_settings.xui index 91483decbb..22ef8bee6e 100644 --- a/media/360/hd/rarch_settings.xui +++ b/media/360/hd/rarch_settings.xui @@ -34,7 +34,6 @@ Rewind granularity: Info messages: Debug info messages: -Menus: Gamma Correction: Shader #1: Shader #2: @@ -262,6 +261,18 @@ Savestate Path Enable: 0.000000,10.000000,0.000000 + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + diff --git a/media/360/sd/rarch_controls.xui b/media/360/sd/rarch_controls.xui index eb93f4deec..5248734d14 100644 --- a/media/360/sd/rarch_controls.xui +++ b/media/360/sd/rarch_controls.xui @@ -8,7 +8,7 @@ XuiScene1 584.528076 363.320007 -32.029999,76.040001,0.000000 +32.029999,48.040001,0.000000 RetroArchControls diff --git a/media/360/sd/rarch_filebrowser.xui b/media/360/sd/rarch_filebrowser.xui index 1c4f0fb1f8..e49448c5c2 100644 --- a/media/360/sd/rarch_filebrowser.xui +++ b/media/360/sd/rarch_filebrowser.xui @@ -8,7 +8,7 @@ XuiSceneFileBrowser 575.888062 336.017609 -32.029999,76.040001,0.000000 +32.029999,48.040001,0.000000 RetroArchFileBrowser diff --git a/media/360/sd/rarch_libretrocore_browser.xui b/media/360/sd/rarch_libretrocore_browser.xui index 25f8692396..4d27405b47 100644 --- a/media/360/sd/rarch_libretrocore_browser.xui +++ b/media/360/sd/rarch_libretrocore_browser.xui @@ -8,7 +8,7 @@ XuiSceneCoreFileBrowser 575.888062 336.017609 -32.029999,76.040001,0.000000 +32.029999,48.040001,0.000000 RetroArchCoreBrowser diff --git a/media/360/sd/rarch_main.xui b/media/360/sd/rarch_main.xui index e72abaf556..c599fb00c3 100644 --- a/media/360/sd/rarch_main.xui +++ b/media/360/sd/rarch_main.xui @@ -8,7 +8,7 @@ XuiScene1 584.528076 363.320007 -32.029472,76.043968,0.000000 +32.029472,48.043968,0.000000 RetroArchMain diff --git a/media/360/sd/rarch_quickmenu.xui b/media/360/sd/rarch_quickmenu.xui index 52cf5102d1..7b3390a6be 100644 --- a/media/360/sd/rarch_quickmenu.xui +++ b/media/360/sd/rarch_quickmenu.xui @@ -29,7 +29,7 @@ XuiQuickMenuList 492.000000 232.720001 -44.880005,64.959991,0.000000 +44.880005,48.959991,0.000000 Load State Save State Aspect Ratio: diff --git a/media/360/sd/rarch_settings.xui b/media/360/sd/rarch_settings.xui index a8f4d7054e..32dff11fcf 100644 --- a/media/360/sd/rarch_settings.xui +++ b/media/360/sd/rarch_settings.xui @@ -8,7 +8,7 @@ XuiScene1 584.528076 363.320007 -32.029999,76.040001,0.000000 +32.029999,48.040001,0.000000 RetroArchSettings @@ -34,7 +34,6 @@ Rewind granularity: Info messages: Debug info messages: -Menus: Gamma Correction: Shader #1: Shader #2: @@ -238,6 +237,18 @@ Savestate Path Enable: 0.000000,10.000000,0.000000 + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + diff --git a/media/360/sd/rarch_shader_browser.xui b/media/360/sd/rarch_shader_browser.xui index 18a2682c4c..143e2d54a8 100644 --- a/media/360/sd/rarch_shader_browser.xui +++ b/media/360/sd/rarch_shader_browser.xui @@ -8,7 +8,7 @@ XuiSceneCoreFileBrowser 575.888062 336.017609 -32.029999,76.040001,0.000000 +32.029999,48.040001,0.000000 RetroArchShaderBrowser