diff --git a/360/media/hd/ssnes_filebrowser.xui b/360/media/hd/ssnes_filebrowser.xui new file mode 100644 index 0000000000..1968fb0723 --- /dev/null +++ b/360/media/hd/ssnes_filebrowser.xui @@ -0,0 +1,183 @@ + + +1280.000000 +720.000000 + + + +XuiSceneFileBrowser +1000.000061 +552.000000 +118.000031,88.000015,0.000000 +SSNESFileBrowser + + + +XuiTxtTitle +111.840027 +40.000000 +28.893612,12.519989,0.000000 +Filebrowser +0xff0f0f0f +0x800f0f0f +Arial Unicode MS +21 + + + + +XuiRomList +945.200073 +376.000031 +22.799980,88.000000,0.000000 +XuiBackButton1 +XuiBackButton1 +XuiBtnGameDir +XuiBtnGameDir + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + + + + +XuiBackButton1 +204.599976 +36.000000 +355.115234,484.396851,0.000000 +XuiBtnCacheDir +XuiBtnGameDir +XuiRomList +XuiRomList +Go back to menu +22593 + + + + +XuiTxtRomPath +166.559998 +28.480011 +96.000000,42.480011,0.000000 +0xff0f0f0f +0x800f0f0f + + + + +XuiLblPath +72.880005 +28.000000 +26.000000,43.000000,0.000000 +PATH: + + + + +XuiBtnGameDir +115.640007 +38.000000 +31.999985,480.000061,0.000000 +XuiBackButton1 +XuiBtnCacheDir +XuiRomList +XuiRomList +game: + + + + +XuiBtnCacheDir +119.960014 +38.000000 +161.999985,480.000061,0.000000 +XuiBtnGameDir +XuiBackButton1 +XuiRomList +XuiRomList +cache: + + + + diff --git a/360/media/hd/ssnes_libsnescore_browser.xui b/360/media/hd/ssnes_libsnescore_browser.xui new file mode 100644 index 0000000000..4310ab4e3a --- /dev/null +++ b/360/media/hd/ssnes_libsnescore_browser.xui @@ -0,0 +1,181 @@ + + +1280.000000 +720.000000 + + + +XuiSceneCoreFileBrowser +920.000122 +552.000000 +176.000015,88.000015,0.000000 +SSNESCoreBrowser + + + +XuiTxtTitle +326.640015 +40.000000 +28.893612,12.519989,0.000000 +Filebrowser - Select a libretro core +0xff0f0f0f +0x800f0f0f +Arial Unicode MS +21 + + + + +XuiRomList +857.200195 +406.400024 +22.799980,81.600006,0.000000 +XuiBackButton1 +XuiBackButton1 +XuiBackButton1 +XuiBackButton1 + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + + + + +XuiBackButton1 +219.000000 +36.000000 +680.000061,504.000061,0.000000 +XuiRomList +XuiRomList +XuiRomList +XuiRomList +Go back to menu +22593 + + + + +XuiTxtRomPath +166.559998 +28.480011 +96.000000,42.480011,0.000000 +0xff0f0f0f +0x800f0f0f + + + + +XuiLblPath +72.880005 +28.000000 +26.000000,43.000000,0.000000 +PATH: + + + + diff --git a/360/media/hd/ssnes_main.xui b/360/media/hd/ssnes_main.xui new file mode 100644 index 0000000000..2e5b0e7c88 --- /dev/null +++ b/360/media/hd/ssnes_main.xui @@ -0,0 +1,116 @@ + + +1280.000000 +720.000000 + + + +XuiScene1 +752.000061 +512.000122 +264.000031,88.000008,0.000000 +SSNESMain + + + +XuiBtnRomBrowser +689.672302 +48.992096 +38.127724,73.215515,0.000000 +245.362122,102.247192,0.000000 +XuiBtnQuit +XuiBtnQuickMenu +ROM Browser + + + + +XuiTxtTitle +247.200012 +40.000000 +43.581604,21.159988,0.000000 +SSNES 360 +0xff0f0f0f +0x800f0f0f +Arial Unicode MS +21 + + + + +XuiBtnSettings +689.672302 +48.992096 +40.000000,263.960022,0.000000 +XuiBtnControls +XuiBtnLibsnesCore +Settings + + + + +XuiBtnQuit +689.672302 +48.992096 +40.199776,392.352020,0.000000 +245.162109,-84.153275,0.000000 +XuiBtnLibsnesCore +XuiBtnRomBrowser +Quit + + + + +XuiLblCore +124.000000 +28.000000 +40.000000,448.400055,0.000000 +Libretro core: + + + + +XuiTxtCoreText +224.399963 +34.000000 +162.400024,448.000031,0.000000 +0xff0f0f0f +0x800f0f0f +Arial Unicode MS + + + + +XuiBtnQuickMenu +689.672302 +48.992096 +39.999996,138.000000,0.000000 +XuiBtnRomBrowser +XuiBtnControls +Quick Menu + + + + +XuiBtnControls +689.672302 +48.992096 +40.002041,202.000015,0.000000 +XuiBtnQuickMenu +XuiBtnSettings +Controls + + + + +XuiBtnLibsnesCore +689.672302 +48.992096 +40.000000,328.959991,0.000000 +XuiBtnSettings +XuiBtnQuit +Change libretro core + + + + diff --git a/360/media/hd/ssnes_quickmenu.xui b/360/media/hd/ssnes_quickmenu.xui new file mode 100644 index 0000000000..290a58f602 --- /dev/null +++ b/360/media/hd/ssnes_quickmenu.xui @@ -0,0 +1,103 @@ + + +1280.000000 +720.000000 + + + +XuiScene1 +824.000061 +496.000061 +182.000031,120.000023,0.000000 +SSNESQuickMenu + + + +XuiTxtTitle +121.056023 +40.000000 +43.581604,21.159988,0.000000 +Quick Menu +0xff0f0f0f +0x800f0f0f +Arial Unicode MS +21 + + + + +XuiBackButton +208.632019 +36.000000 +568.000061,432.000000,0.000000 +XuiQuickMenuList +XuiQuickMenuList +XuiQuickMenuList +XuiQuickMenuList +Go back to menu +22593 + + + + +XuiQuickMenuList +723.120056 +367.040009 +44.880005,64.959991,0.000000 +XuiBackButton +XuiBackButton +XuiBackButton +XuiBackButton +Load State +Save State +Hardware filtering: +Aspect Ratio: +Overscan: +Orientation: +Resize Mode +Frame Advance +Screenshot Mode +Reset +Return to Game +Return to Dashboard + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + + + + diff --git a/360/media/hd/ssnes_settings.xui b/360/media/hd/ssnes_settings.xui new file mode 100644 index 0000000000..f5b7e13f2e --- /dev/null +++ b/360/media/hd/ssnes_settings.xui @@ -0,0 +1,118 @@ + + +1280.000000 +720.000000 + + + +XuiScene1 +776.000061 +512.000061 +198.000031,112.000023,0.000000 +SSNESSettings + + + +XuiTxtTitle +121.056023 +40.000000 +43.581604,21.159988,0.000000 +Settings +0xff0f0f0f +0x800f0f0f +Arial Unicode MS +21 + + + + +XuiBackButton +208.632019 +36.000000 +536.000000,448.000000,0.000000 +XuiSettingsList +XuiSettingsList +XuiSettingsList +XuiSettingsList +Go back to menu +22593 + + + + +XuiSettingsList +683.120056 +383.040009 +44.880005,64.959991,0.000000 +XuiBackButton +XuiBackButton +XuiBackButton +XuiBackButton +Rewind: +Gamma Correction: +Hardware filtering: + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +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 + + + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + + + + diff --git a/360/media/ssnes_filebrowser.xui b/360/media/sd/ssnes_filebrowser.xui similarity index 91% rename from 360/media/ssnes_filebrowser.xui rename to 360/media/sd/ssnes_filebrowser.xui index 93c661e781..ad4f01f1f9 100644 --- a/360/media/ssnes_filebrowser.xui +++ b/360/media/sd/ssnes_filebrowser.xui @@ -8,7 +8,7 @@ XuiSceneFileBrowser 575.888062 336.017609 -353.995880,209.035965,0.000000 +333.995880,209.035965,0.000000 SSNESFileBrowser @@ -95,6 +95,18 @@ 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/360/media/ssnes_libsnescore_browser.xui b/360/media/sd/ssnes_libsnescore_browser.xui similarity index 90% rename from 360/media/ssnes_libsnescore_browser.xui rename to 360/media/sd/ssnes_libsnescore_browser.xui index 216c8c73a9..7a1665b687 100644 --- a/360/media/ssnes_libsnescore_browser.xui +++ b/360/media/sd/ssnes_libsnescore_browser.xui @@ -17,7 +17,7 @@ 326.640015 40.000000 28.893612,12.519989,0.000000 -Filebrowser - Select a libsnes core +Filebrowser - Select a libretro core 0xff0f0f0f 0x800f0f0f Arial Unicode MS @@ -107,6 +107,18 @@ 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/360/media/ssnes_main.xui b/360/media/sd/ssnes_main.xui similarity index 97% rename from 360/media/ssnes_main.xui rename to 360/media/sd/ssnes_main.xui index 505b554147..a2c498d464 100644 --- a/360/media/ssnes_main.xui +++ b/360/media/sd/ssnes_main.xui @@ -65,7 +65,7 @@ 124.000000 28.000000 12.544006,324.792023,0.000000 -Libsnes core: +Libretro core: @@ -109,7 +109,7 @@ 38.127960,241.615982,0.000000 XuiBtnSettings XuiBtnQuit -Change libsnes core +Change libretro core diff --git a/360/media/ssnes_quickmenu.xui b/360/media/sd/ssnes_quickmenu.xui similarity index 83% rename from 360/media/ssnes_quickmenu.xui rename to 360/media/sd/ssnes_quickmenu.xui index e0e97c34b5..9223aa52a7 100644 --- a/360/media/ssnes_quickmenu.xui +++ b/360/media/sd/ssnes_quickmenu.xui @@ -8,7 +8,7 @@ XuiScene1 584.528076 363.320007 -347.429474,184.843964,0.000000 +302.429474,184.843964,0.000000 SSNESQuickMenu @@ -74,6 +74,18 @@ Return to Dashboard 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/360/media/ssnes_settings.xui b/360/media/sd/ssnes_settings.xui similarity index 100% rename from 360/media/ssnes_settings.xui rename to 360/media/sd/ssnes_settings.xui diff --git a/360/menu.cpp b/360/menu.cpp index 6b5b436447..d51487d193 100644 --- a/360/menu.cpp +++ b/360/menu.cpp @@ -419,11 +419,15 @@ HRESULT CSSNESSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled ) HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled ) { + xdk360_video_t *vid = (xdk360_video_t*)g_d3d; + + bool hdmenus_allowed = vid->video_mode.fIsHiDef && (g_console.aspect_ratio_index >= ASPECT_RATIO_16_9); + HRESULT hr; if ( hObjPressed == m_filebrowser ) { - hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_filebrowser.xur", NULL, &app.hFileBrowser); + hr = XuiSceneCreate(hdmenus_allowed ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"ssnes_filebrowser.xur", NULL, &app.hFileBrowser); if (FAILED(hr)) { @@ -434,7 +438,7 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled ) } else if ( hObjPressed == m_quick_menu) { - hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_quickmenu.xur", NULL, &app.hQuickMenu); + hr = XuiSceneCreate(hdmenus_allowed ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"ssnes_quickmenu.xur", NULL, &app.hQuickMenu); if (FAILED(hr)) SSNES_ERR("Failed to load scene.\n"); @@ -443,7 +447,7 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled ) } else if ( hObjPressed == m_change_libsnes_core ) { - hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_libsnescore_browser.xur", NULL, &app.hCoreBrowser); + hr = XuiSceneCreate(hdmenus_allowed ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"ssnes_libsnescore_browser.xur", NULL, &app.hCoreBrowser); if (FAILED(hr)) { @@ -453,7 +457,7 @@ HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled ) } else if ( hObjPressed == m_settings ) { - hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_settings.xur", NULL, &app.hSSNESSettings); + hr = XuiSceneCreate(hdmenus_allowed ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"ssnes_settings.xur", NULL, &app.hSSNESSettings); if (FAILED(hr)) SSNES_ERR("Failed to load scene.\n"); @@ -496,7 +500,7 @@ int menu_init (void) return 1; } - hr = XuiSceneCreate(L"file://game:/media/", L"ssnes_main.xur", NULL, &app.hMainScene); + hr = XuiSceneCreate(L"file://game:/media/sd/", L"ssnes_main.xur", NULL, &app.hMainScene); if (FAILED(hr)) { SSNES_ERR("Failed to create scene 'ssnes_main.xur'.\n"); diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj index 8074ce93b8..e50d1dc770 100644 --- a/msvc-360/SSNES-360/SSNES-360.vcxproj +++ b/msvc-360/SSNES-360/SSNES-360.vcxproj @@ -414,54 +414,54 @@ - + Document - $(OutDir)media\ssnes_main.xur; - $(OutDir)media\ssnes_main.xur; - $(OutDir)media\ssnes_main.xur; - $(OutDir)media\ssnes_main.xur; - $(OutDir)media\ssnes_main.xur; - $(OutDir)media\ssnes_main.xur; - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur" + $(OutDir)media\sd\ssnes_main.xur; + $(OutDir)media\sd\ssnes_main.xur; + $(OutDir)media\sd\ssnes_main.xur; + $(OutDir)media\sd\ssnes_main.xur; + $(OutDir)media\sd\ssnes_main.xur; + $(OutDir)media\sd\ssnes_main.xur; + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\sd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\sd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\sd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\sd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\sd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\sd\ssnes_main.xur" - + Document - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\ssnes_settings.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\ssnes_settings.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\ssnes_settings.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\ssnes_settings.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\ssnes_settings.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\ssnes_settings.xur" - $(OutDir)media\ssnes_settings.xur; - $(OutDir)media\ssnes_settings.xur; - $(OutDir)media\ssnes_settings.xur; - $(OutDir)media\ssnes_settings.xur; - $(OutDir)media\ssnes_settings.xur; - $(OutDir)media\ssnes_settings.xur; + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\sd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\sd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\sd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\sd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\sd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\sd\ssnes_settings.xur" + $(OutDir)media\sd\ssnes_settings.xur; + $(OutDir)media\sd\ssnes_settings.xur; + $(OutDir)media\sd\ssnes_settings.xur; + $(OutDir)media\sd\ssnes_settings.xur; + $(OutDir)media\sd\ssnes_settings.xur; + $(OutDir)media\sd\ssnes_settings.xur; - + Document - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\ssnes_filebrowser.xur" - $(OutDir)media\ssnes_filebrowser.xur; - $(OutDir)media\ssnes_filebrowser.xur; - $(OutDir)media\ssnes_filebrowser.xur; - $(OutDir)media\ssnes_filebrowser.xur; - $(OutDir)media\ssnes_filebrowser.xur; - $(OutDir)media\ssnes_filebrowser.xur; - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\ssnes_filebrowser.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\ssnes_filebrowser.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\ssnes_filebrowser.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\ssnes_filebrowser.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\sd\ssnes_filebrowser.xur" + $(OutDir)media\sd\ssnes_filebrowser.xur; + $(OutDir)media\sd\ssnes_filebrowser.xur; + $(OutDir)media\sd\ssnes_filebrowser.xur; + $(OutDir)media\sd\ssnes_filebrowser.xur; + $(OutDir)media\sd\ssnes_filebrowser.xur; + $(OutDir)media\sd\ssnes_filebrowser.xur; + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\sd\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\sd\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\sd\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\sd\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\sd\ssnes_filebrowser.xur" @@ -514,37 +514,37 @@ - + Document - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\ssnes_quickmenu.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\ssnes_quickmenu.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\ssnes_quickmenu.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\ssnes_quickmenu.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\ssnes_quickmenu.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\ssnes_quickmenu.xur" - $(OutDir)media\ssnes_quickmenu.xur; - $(OutDir)media\ssnes_quickmenu.xur; - $(OutDir)media\ssnes_quickmenu.xur; - $(OutDir)media\ssnes_quickmenu.xur; - $(OutDir)media\ssnes_quickmenu.xur; - $(OutDir)media\ssnes_quickmenu.xur; + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\sd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\sd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\sd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\sd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\sd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\sd\ssnes_quickmenu.xur" + $(OutDir)media\sd\ssnes_quickmenu.xur; + $(OutDir)media\sd\ssnes_quickmenu.xur; + $(OutDir)media\sd\ssnes_quickmenu.xur; + $(OutDir)media\sd\ssnes_quickmenu.xur; + $(OutDir)media\sd\ssnes_quickmenu.xur; + $(OutDir)media\sd\ssnes_quickmenu.xur; - + Document - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\ssnes_libsnescore_browser.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\ssnes_libsnescore_browser.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\ssnes_libsnescore_browser.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\ssnes_libsnescore_browser.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\ssnes_libsnescore_browser.xur" - xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\ssnes_libsnescore_browser.xur" - $(OutDir)media\ssnes_libsnescore_browser.xur; - $(OutDir)media\ssnes_libsnescore_browser.xur; - $(OutDir)media\ssnes_libsnescore_browser.xur; - $(OutDir)media\ssnes_libsnescore_browser.xur; - $(OutDir)media\ssnes_libsnescore_browser.xur; - $(OutDir)media\ssnes_libsnescore_browser.xur; + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\sd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\sd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\sd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\sd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\sd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\sd\ssnes_libsnescore_browser.xur" + $(OutDir)media\sd\ssnes_libsnescore_browser.xur; + $(OutDir)media\sd\ssnes_libsnescore_browser.xur; + $(OutDir)media\sd\ssnes_libsnescore_browser.xur; + $(OutDir)media\sd\ssnes_libsnescore_browser.xur; + $(OutDir)media\sd\ssnes_libsnescore_browser.xur; + $(OutDir)media\sd\ssnes_libsnescore_browser.xur; @@ -564,7 +564,84 @@ copy %(FullPath) $(OutDir)media\shaders\stock.cg + + + Document + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\hd\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\hd\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\hd\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\hd\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\hd\ssnes_filebrowser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_filebrowser.xui" "$(OutDir)media\hd\ssnes_filebrowser.xur" + $(OutDir)media\hd\ssnes_filebrowser.xur; + $(OutDir)media\hd\ssnes_filebrowser.xur; + $(OutDir)media\hd\ssnes_filebrowser.xur; + $(OutDir)media\hd\ssnes_filebrowser.xur; + $(OutDir)media\hd\ssnes_filebrowser.xur; + $(OutDir)media\hd\ssnes_filebrowser.xur; + + + Document + $(OutDir)media\hd\ssnes_libsnescore_browser.xur; + $(OutDir)media\hd\ssnes_libsnescore_browser.xur; + $(OutDir)media\hd\ssnes_libsnescore_browser.xur; + $(OutDir)media\hd\ssnes_libsnescore_browser.xur; + $(OutDir)media\hd\ssnes_libsnescore_browser.xur; + $(OutDir)media\hd\ssnes_libsnescore_browser.xur; + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\hd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\hd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\hd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\hd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\hd\ssnes_libsnescore_browser.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_libsnescore_browser.xui" "$(OutDir)media\hd\ssnes_libsnescore_browser.xur" + + + Document + $(OutDir)media\hd\ssnes_main.xur; + $(OutDir)media\hd\ssnes_main.xur; + $(OutDir)media\hd\ssnes_main.xur; + $(OutDir)media\hd\ssnes_main.xur; + $(OutDir)media\hd\ssnes_main.xur; + $(OutDir)media\hd\ssnes_main.xur; + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\hd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\hd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\hd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\hd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\hd\ssnes_main.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\hd\ssnes_main.xur" + + + Document + $(OutDir)media\hd\ssnes_quickmenu.xur; + $(OutDir)media\hd\ssnes_quickmenu.xur; + $(OutDir)media\hd\ssnes_quickmenu.xur; + $(OutDir)media\hd\ssnes_quickmenu.xur; + $(OutDir)media\hd\ssnes_quickmenu.xur; + $(OutDir)media\hd\ssnes_quickmenu.xur; + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\hd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\hd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\hd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\hd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\hd\ssnes_quickmenu.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_quickmenu.xui" "$(OutDir)media\hd\ssnes_quickmenu.xur" + + + Document + $(OutDir)media\hd\ssnes_settings.xur; + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\hd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\hd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\hd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\hd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\hd\ssnes_settings.xur" + xui2bin /D /NOLOGO "%(RelativeDir)ssnes_settings.xui" "$(OutDir)media\hd\ssnes_settings.xur" + $(OutDir)media\hd\ssnes_settings.xur; + $(OutDir)media\hd\ssnes_settings.xur; + $(OutDir)media\hd\ssnes_settings.xur; + $(OutDir)media\hd\ssnes_settings.xur; + $(OutDir)media\hd\ssnes_settings.xur; + + - \ No newline at end of file + diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters index fffd1b6867..49ae0d75cf 100644 --- a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters +++ b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters @@ -36,6 +36,12 @@ {c868cc96-a0ac-4672-a4ca-dd7c28277972} + + {d50021e0-79f4-42c0-b190-1c31fa4fe2b2} + + + {76fa04d8-4379-4b8c-ae79-2aa78d380e06} + @@ -138,15 +144,6 @@ Source Files\media - - Source Files\media - - - Source Files\media - - - Source Files\media - Source Files\media @@ -156,14 +153,38 @@ Source Files\media - - Source Files\media - - - Source Files\media - Source Files\media\shader + + Source Files\media\sd + + + Source Files\media\sd + + + Source Files\media\sd + + + Source Files\media\sd + + + Source Files\media\sd + + + Source Files\media\hd + + + Source Files\media\hd + + + Source Files\media\hd + + + Source Files\media\hd + + + Source Files\media\hd + \ No newline at end of file diff --git a/ps3/menu.c b/ps3/menu.c index 380224f1f5..69018d6314 100644 --- a/ps3/menu.c +++ b/ps3/menu.c @@ -2520,7 +2520,7 @@ static void ingame_menu(uint32_t menu_id) cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MENU)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MENU), "Return to Menu"); cellDbgFontDraw(); - cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_CHANGE_LIBSNES)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_CHANGE_LIBSNES), "Change libsnes core"); + cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_CHANGE_LIBSNES)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_CHANGE_LIBSNES), "Change libretro core"); cellDbgFontDraw(); cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MULTIMAN)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MULTIMAN), "Return to multiMAN");