(360) Menu - A/B images show up now

This commit is contained in:
TwinAphex51224 2012-02-08 16:10:01 +01:00
parent 93072b926e
commit f6edb9a607
6 changed files with 51 additions and 12 deletions

BIN
360/media/a.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
360/media/b.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -29,9 +29,6 @@
#include "../general.h" #include "../general.h"
CSSNES app; CSSNES app;
HXUIOBJ hMainScene;
HXUIOBJ hFileBrowser;
HXUIOBJ hSSNESSettings;
filebrowser_t browser; filebrowser_t browser;
char strbuffer[1024]; char strbuffer[1024];
@ -143,7 +140,7 @@ HRESULT CSSNESFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
} }
else if(hObjPressed == m_back) else if(hObjPressed == m_back)
{ {
NavigateBack(hMainScene); NavigateBack(app.hMainScene);
} }
bHandled = TRUE; bHandled = TRUE;
@ -159,14 +156,14 @@ HRESULT CSSNESSettings::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
} }
else if ( hObjPressed == m_back ) else if ( hObjPressed == m_back )
{ {
HRESULT hr = XuiSceneNavigateBack(hSSNESSettings, hMainScene, XUSER_INDEX_FOCUS); HRESULT hr = XuiSceneNavigateBack(app.hSSNESSettings, app.hMainScene, XUSER_INDEX_FOCUS);
if (FAILED(hr)) if (FAILED(hr))
{ {
SSNES_ERR("Failed to load scene.\n"); SSNES_ERR("Failed to load scene.\n");
} }
NavigateBack(hMainScene); NavigateBack(app.hMainScene);
} }
bHandled = TRUE; bHandled = TRUE;
return S_OK; return S_OK;
@ -178,25 +175,25 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
if ( hObjPressed == m_filebrowser ) if ( hObjPressed == m_filebrowser )
{ {
hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_filebrowser.xur", NULL, &hFileBrowser); hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_filebrowser.xur", NULL, &app.hFileBrowser);
if (FAILED(hr)) if (FAILED(hr))
{ {
SSNES_ERR("Failed to load scene.\n"); SSNES_ERR("Failed to load scene.\n");
} }
NavigateForward(hFileBrowser); NavigateForward(app.hFileBrowser);
} }
else if ( hObjPressed == m_settings ) else if ( hObjPressed == m_settings )
{ {
hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_settings.xur", NULL, &hSSNESSettings); hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_settings.xur", NULL, &app.hSSNESSettings);
if (FAILED(hr)) if (FAILED(hr))
{ {
SSNES_ERR("Failed to load scene.\n"); SSNES_ERR("Failed to load scene.\n");
} }
NavigateForward(hSSNESSettings); NavigateForward(app.hSSNESSettings);
} }
else if ( hObjPressed == m_quit ) else if ( hObjPressed == m_quit )
{ {
@ -238,14 +235,14 @@ int menu_init (void)
return 1; return 1;
} }
hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_main.xur", NULL, &hMainScene); hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_main.xur", NULL, &app.hMainScene);
if (FAILED(hr)) if (FAILED(hr))
{ {
SSNES_ERR("Failed to create scene 'ssnes_main.xur'.\n"); SSNES_ERR("Failed to create scene 'ssnes_main.xur'.\n");
return 1; return 1;
} }
XuiSceneNavigateFirst(app.GetRootObj(), hMainScene, XUSER_INDEX_FOCUS); XuiSceneNavigateFirst(app.GetRootObj(), app.hMainScene, XUSER_INDEX_FOCUS);
return 0; return 0;
} }

View File

@ -6,6 +6,10 @@
class CSSNES : public CXuiModule class CSSNES : public CXuiModule
{ {
public:
HXUIOBJ hMainScene;
HXUIOBJ hFileBrowser;
HXUIOBJ hSSNESSettings;
protected: protected:
/* Override so that Cssnes can register classes */ /* Override so that Cssnes can register classes */
virtual HRESULT RegisterXuiClasses(); virtual HRESULT RegisterXuiClasses();

View File

@ -426,6 +426,38 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\ssnes_filebrowser.xur"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\ssnes_filebrowser.xur"</Command>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\360\media\a.png">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">copy %(FullPath) $(OutDir)media\a.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">copy %(FullPath) $(OutDir)media\a.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">copy %(FullPath) $(OutDir)media\a.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">copy %(FullPath) $(OutDir)media\a.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">copy %(FullPath) $(OutDir)media\a.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">copy %(FullPath) $(OutDir)media\a.png</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\a.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\a.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\a.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\a.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\a.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\a.png;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="..\..\360\media\b.png">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">copy %(FullPath) $(OutDir)media\b.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">copy %(FullPath) $(OutDir)media\b.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">copy %(FullPath) $(OutDir)media\b.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">copy %(FullPath) $(OutDir)media\b.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">copy %(FullPath) $(OutDir)media\b.png</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">copy %(FullPath) $(OutDir)media\b.png</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\b.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\b.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\b.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\b.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\b.png;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\b.png;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

View File

@ -240,5 +240,11 @@
<CustomBuild Include="..\..\360\media\ssnes_filebrowser.xui"> <CustomBuild Include="..\..\360\media\ssnes_filebrowser.xui">
<Filter>Source Files\media</Filter> <Filter>Source Files\media</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\360\media\a.png">
<Filter>Source Files\media</Filter>
</CustomBuild>
<CustomBuild Include="..\..\360\media\b.png">
<Filter>Source Files\media</Filter>
</CustomBuild>
</ItemGroup> </ItemGroup>
</Project> </Project>