diff --git a/ONEMenuVita/eboot.bin b/ONEMenuVita/eboot.bin index 565c1325..ff14b493 100644 Binary files a/ONEMenuVita/eboot.bin and b/ONEMenuVita/eboot.bin differ diff --git a/ONEMenuVita/system/appmanager/system.lua b/ONEMenuVita/system/appmanager/system.lua index 2e091b8b..3f08dd6f 100644 --- a/ONEMenuVita/system/appmanager/system.lua +++ b/ONEMenuVita/system/appmanager/system.lua @@ -71,6 +71,26 @@ local update_callback = function () SubOptions() end +local restart_callback = function () + os.delay(150) + os.restart() +end + +local reboot_callback = function () + os.delay(1000) + power.restart() +end + +local shutdown_callback = function () + os.delay(1000) + power.shutdown() +end + +local exit_callback = function () + os.delay(500) + os.exit() +end + function SubOptions() if __PIC1 == 1 then showpic = STRINGS_APP_YES else showpic = STRINGS_APP_NO end if __SLIDES == 100 then var = STRINGS_APP_SLIDE_ORIGINAL else var = STRINGS_APP_SLIDE_PS4 end @@ -84,6 +104,13 @@ function SubOptions() { text = STRINGS_SUBMENU_THEMES, funct = themesONEMenu_callback, descr = STRINGS_THEMES1MENU_DESCR }, { text = STRINGS_ENABLE_UPDATE.._update, funct = update_callback, pad = true, descr = STRINGS_ENABLE_UPDATE_DESCR }, + + { text = STRINGS_SUBMENU_RESTART, funct = restart_callback, descr = STRINGS_RESTART_DESCR }, + { text = STRINGS_SUBMENU_RESET, funct = reboot_callback, descr = STRINGS_REBOOT_DESCR }, + { text = STRINGS_SUBMENU_POWEROFF, funct = shutdown_callback, descr = STRINGS_POWEROFF_DESCR }, + + { text = STRINGS_SUBMENU_EXIT, funct = exit_callback, descr = STRINGS_EXIT_DESCR }, + } end @@ -109,7 +136,7 @@ function SubSystem() screen.print(480,y, Sub_Options[i].text,1.0,theme.style.TXTCOLOR,theme.style.TXTBKGCOLOR,__ACENTER) - if i == 1 or i == 4 or i == 6 or i == 8 then + if i == 1 or i == 4 or i == 5 or i == 8 then y+=36 else y+=26 diff --git a/ONEMenuVita/system/explorer/explorer.lua b/ONEMenuVita/system/explorer/explorer.lua index ac568784..fcbe6f20 100644 --- a/ONEMenuVita/system/explorer/explorer.lua +++ b/ONEMenuVita/system/explorer/explorer.lua @@ -172,8 +172,12 @@ function ctrls_explorer_list() end if scroll.list.maxim > 0 then -- Is exists any? - if buttons.up or buttons.analogly < -60 then scroll.list:up() end - if buttons.down or buttons.analogly > 60 then scroll.list:down() end + if buttons.up or buttons.analogly < -60 then + if scroll.list:up() then xtitle=35 end + end + if buttons.down or buttons.analogly > 60 then + if scroll.list:down() then xtitle=35 end + end if buttons.accept then if explorer.list[scroll.list.sel].size then diff --git a/ONEMenuVita/system/explorer/refresh.lua b/ONEMenuVita/system/explorer/refresh.lua index 4ce0083f..9132584f 100644 --- a/ONEMenuVita/system/explorer/refresh.lua +++ b/ONEMenuVita/system/explorer/refresh.lua @@ -71,13 +71,12 @@ function refresh_init(img) end if img then img:blit(0,0) end - message_wait() + message_wait(STRINGS_LIVEAREA_SEARCH_GAMES) os.delay(15) local vbuff = screen.toimage() if vbuff then vbuff:blit(0,0) elseif img then img:blit(0,0) end - local list = {} --Scanning ux0:app local tmp = files.listdirs("ux0:app") @@ -179,12 +178,103 @@ function refresh_init(img) end else - os.message(STRINGS_LIVEAREA_NO_GAMES) + --os.message(STRINGS_LIVEAREA_NO_GAMES) end - if count > 0 then os.message(STRINGS_LIVEAREA_GAMES..count) end + if count > 0 then os.message(STRINGS_LIVEAREA_GAMES..count) else os.message(STRINGS_LIVEAREA_NO_GAMES) end + __TITTLEAPP, __IDAPP = "","" + count = 0 + + if img then img:blit(0,0) elseif vbuff then vbuff:blit(0,0) end + message_wait(STRINGS_LIVEAREA_EXTRAREFRESH) + os.delay(15) + + local installs = game.extrarefresh() + os.message(STRINGS_LIVEAREA_TOTAL_EXTRA..installs) + + if img then img:blit(0,0) elseif vbuff then vbuff:blit(0,0) end + message_wait(STRINGS_LIVEAREA_SEARCH_PSP) + os.delay(15) + + __NOPSPEMUDRM = os.lmodule("NoPspEmuDrm_kern") + + --os.message("pspemu: "..tostring(__NOPSPEMUDRM)) + if __NOPSPEMUDRM then + --Scanning ux0:pspemu + local tmp = files.listdirs("ux0:pspemu/PSP/GAME") + local list_psp = {} + if tmp and #tmp > 0 then + table.sort(tmp ,function (a,b) return string.lower(a.name) 0 then os.message(STRINGS_LIVEAREA_PSP..count) end + end + if count > 0 then os.message(STRINGS_LIVEAREA_PSP..count) else os.message(STRINGS_LIVEAREA_NO_PSP) end + + if img then img:blit(0,0) elseif vbuff then vbuff:blit(0,0) end + message_wait(STRINGS_LIVEAREA_SEARCH_PSM) + os.delay(15) + + __TITTLEAPP, __IDAPP = "","" count = 0 --Scanning ux0:psm local tmp = files.listdirs("ux0:psm") @@ -241,16 +331,9 @@ function refresh_init(img) end end - if count > 0 then os.message(STRINGS_LIVEAREA_GAMES_PSM..count) end + if count > 0 then os.message(STRINGS_LIVEAREA_GAMES_PSM..count) else os.message(STRINGS_LIVEAREA_NO_PSM) end __TITTLEAPP, __IDAPP = "","" - if img then img:blit(0,0) elseif vbuff then vbuff:blit(0,0) end - message_wait(STRINGS_LIVEAREA_EXTRAREFRESH) - os.delay(15) - - local installs = game.extrarefresh() - os.message(STRINGS_LIVEAREA_TOTAL_EXTRA..installs) - infodevices() os.delay(15) if vbuff then vbuff:blit(0,0) elseif img then img:blit(0,0) end diff --git a/ONEMenuVita/system/lang/english_us.txt b/ONEMenuVita/system/lang/english_us.txt index 8f5426c2..27cf5466 100644 --- a/ONEMenuVita/system/lang/english_us.txt +++ b/ONEMenuVita/system/lang/english_us.txt @@ -38,6 +38,7 @@ STRINGS_FOLDERS_DELETE = "Folders Eliminated" STRINGS_SUBMENU_RESTART = "Restart ONEMenu" STRINGS_SUBMENU_RESET = "Power Reset" STRINGS_SUBMENU_POWEROFF = "Shutdown" +STRINGS_SUBMENU_EXIT = "Exit" STRINGS_SUBMENU_QR = "QR DownLoader" STRINGS_SUBMENU_QR_SCAN = "QR Scanning" STRINGS_SUBMENU_QR_ACTIVE = "Active download in the LiveArea" @@ -250,9 +251,14 @@ STRINGS_EXPORT_REBOOT = "It is necesary to restart your PS vita" STRINGS_LIVEAREA_NOTINSTALLED = "\n\nGame not installed: " STRINGS_LIVEAREA_GAMES = "\n\nTotal Installed Vita Games/Homebrews: " STRINGS_LIVEAREA_GAMES_PSM = "\n\nTotal Installed PSM Games: " +STRINGS_LIVEAREA_PSP = "\n\nTotal Installed PSP&PSX Games: " STRINGS_LIVEAREA_NO_GAMES = "\n\nNo Vita Games/Homebrews found" STRINGS_LIVEAREA_NO_PSM = "\n\nNo PSM Games found" +STRINGS_LIVEAREA_NO_PSP = "\n\nNo PSP & PSX Games found" +STRINGS_LIVEAREA_SEARCH_GAMES = "Search Vita Games/Homebrews" STRINGS_LIVEAREA_EXTRAREFRESH = "Search DLCs & Updates" +STRINGS_LIVEAREA_SEARCH_PSP = "Search PSP & PSX Games" +STRINGS_LIVEAREA_SEARCH_PSM = "Search PSM Games" STRINGS_LIVEAREA_TOTAL_EXTRA = "\n\nInstalled DLCs & Updates: " ------------ System SubMenu ----------------------------------------------------------------------------- @@ -264,6 +270,7 @@ STRINGS_MULTIMEDIA_DESCR = "Delete empty directories on multimedia directories: STRINGS_RESTART_DESCR = "Restart ONEMenu" STRINGS_REBOOT_DESCR = "Restart PSVita" STRINGS_POWEROFF_DESCR = "Shutdown PSVita" +STRINGS_EXIT_DESCR = "Exit ONEMenu" STRINGS_UPDATE_DB_DESCR = "Update your database without lose your iconlayout" STRINGS_REBUILD_DB_DESCR = "Rebuild the database (losing your iconlayout)" STRINGS_CUSTOMTHEMES_DESCR = "You can uninstall CustomThemes (not official themes)"