(Rmenu XUI) Remove menu HD/SD switch

This commit is contained in:
twinaphex 2013-01-23 18:28:05 +01:00
parent 1e4612937d
commit ef58bc2a0d
10 changed files with 31 additions and 33 deletions

View File

@ -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();

View File

@ -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,

View File

@ -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:
<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
</Properties>
</XuiListItem>
<XuiListItem>
<Properties>
<Id>control_ListItem</Id>
<Width>226.000000</Width>
<Height>45.000000</Height>
<Position>7.000000,22.000000,0.000000</Position>
<Anchor>5</Anchor>
<Show>false</Show>
<Visual>XuiButton</Visual>
<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
</Properties>
</XuiListItem>
</XuiCommonList>
<XuiBackButton>
<Properties>

View File

@ -8,7 +8,7 @@
<Id>XuiScene1</Id>
<Width>584.528076</Width>
<Height>363.320007</Height>
<Position>32.029999,76.040001,0.000000</Position>
<Position>32.029999,48.040001,0.000000</Position>
<ClassOverride>RetroArchControls</ClassOverride>
</Properties>
<XuiText>

View File

@ -8,7 +8,7 @@
<Id>XuiSceneFileBrowser</Id>
<Width>575.888062</Width>
<Height>336.017609</Height>
<Position>32.029999,76.040001,0.000000</Position>
<Position>32.029999,48.040001,0.000000</Position>
<ClassOverride>RetroArchFileBrowser</ClassOverride>
</Properties>
<XuiText>

View File

@ -8,7 +8,7 @@
<Id>XuiSceneCoreFileBrowser</Id>
<Width>575.888062</Width>
<Height>336.017609</Height>
<Position>32.029999,76.040001,0.000000</Position>
<Position>32.029999,48.040001,0.000000</Position>
<ClassOverride>RetroArchCoreBrowser</ClassOverride>
</Properties>
<XuiText>

View File

@ -8,7 +8,7 @@
<Id>XuiScene1</Id>
<Width>584.528076</Width>
<Height>363.320007</Height>
<Position>32.029472,76.043968,0.000000</Position>
<Position>32.029472,48.043968,0.000000</Position>
<ClassOverride>RetroArchMain</ClassOverride>
</Properties>
<XuiButton>

View File

@ -29,7 +29,7 @@
<Id>XuiQuickMenuList</Id>
<Width>492.000000</Width>
<Height>232.720001</Height>
<Position>44.880005,64.959991,0.000000</Position>
<Position>44.880005,48.959991,0.000000</Position>
<ItemsText>Load State
Save State
Aspect Ratio:

View File

@ -8,7 +8,7 @@
<Id>XuiScene1</Id>
<Width>584.528076</Width>
<Height>363.320007</Height>
<Position>32.029999,76.040001,0.000000</Position>
<Position>32.029999,48.040001,0.000000</Position>
<ClassOverride>RetroArchSettings</ClassOverride>
</Properties>
<XuiText>
@ -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:
<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
</Properties>
</XuiListItem>
<XuiListItem>
<Properties>
<Id>control_ListItem</Id>
<Width>226.000000</Width>
<Height>45.000000</Height>
<Position>7.000000,22.000000,0.000000</Position>
<Anchor>5</Anchor>
<Show>false</Show>
<Visual>XuiButton</Visual>
<InterItemSpacing>0.000000,10.000000,0.000000</InterItemSpacing>
</Properties>
</XuiListItem>
</XuiCommonList>
<XuiBackButton>
<Properties>

View File

@ -8,7 +8,7 @@
<Id>XuiSceneCoreFileBrowser</Id>
<Width>575.888062</Width>
<Height>336.017609</Height>
<Position>32.029999,76.040001,0.000000</Position>
<Position>32.029999,48.040001,0.000000</Position>
<ClassOverride>RetroArchShaderBrowser</ClassOverride>
</Properties>
<XuiText>