mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-01 00:55:06 +01:00
- Added shutdown to idle standby option on page 12 of main settings. Set to yes for idle standby (yellow light). wii u users leave off.
This commit is contained in:
parent
0787670dea
commit
76b4308e01
BIN
out/boot.dol
BIN
out/boot.dol
Binary file not shown.
Before Width: | Height: | Size: 3.4 MiB After Width: | Height: | Size: 3.4 MiB |
@ -98,10 +98,15 @@ void Sys_Exit(void)
|
|||||||
{
|
{
|
||||||
/* Shutdown Inputs */
|
/* Shutdown Inputs */
|
||||||
Close_Inputs();
|
Close_Inputs();
|
||||||
/* Just shutdown console*/
|
|
||||||
if(ExitOption == BUTTON_CALLBACK)
|
/* shutdown console without wc24*/
|
||||||
|
if(ExitOption == SHUTDOWN_STANDBY)
|
||||||
SYS_ResetSystem(SYS_POWEROFF_STANDBY, 0, 0);
|
SYS_ResetSystem(SYS_POWEROFF_STANDBY, 0, 0);
|
||||||
|
|
||||||
|
/* shutdown console with wc24 (riiconnect24) */
|
||||||
|
if(ExitOption == SHUTDOWN_IDLE)
|
||||||
|
SYS_ResetSystem(SYS_POWEROFF_IDLE, 0, 0);
|
||||||
|
|
||||||
if(!isWiiVC)
|
if(!isWiiVC)
|
||||||
{
|
{
|
||||||
/* We wanna to boot something */
|
/* We wanna to boot something */
|
||||||
|
@ -27,7 +27,8 @@ enum
|
|||||||
EXIT_TO_BOOTMII,
|
EXIT_TO_BOOTMII,
|
||||||
EXIT_TO_WFNK2O,
|
EXIT_TO_WFNK2O,
|
||||||
EXIT_TO_SMNK2O,
|
EXIT_TO_SMNK2O,
|
||||||
BUTTON_CALLBACK,
|
SHUTDOWN_STANDBY,
|
||||||
|
SHUTDOWN_IDLE,
|
||||||
WIIFLOW_DEF,// m_cfg.getInt("GENERAL", "exit_to", 0). (EXIT_TO_MENU, EXIT_TO_HBC, EXIT_TO_WIIU)
|
WIIFLOW_DEF,// m_cfg.getInt("GENERAL", "exit_to", 0). (EXIT_TO_MENU, EXIT_TO_HBC, EXIT_TO_WIIU)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1715,7 +1715,12 @@ void CMenu::_mainLoopCommon(bool withCF, bool adjusting)
|
|||||||
|
|
||||||
// check if power button is pressed and exit wiiflow
|
// check if power button is pressed and exit wiiflow
|
||||||
if(Sys_Exiting())
|
if(Sys_Exiting())
|
||||||
exitHandler(BUTTON_CALLBACK);
|
{
|
||||||
|
if(m_cfg.getBool("GENERAL", "idle_standby", false))
|
||||||
|
exitHandler(SHUTDOWN_IDLE);
|
||||||
|
else
|
||||||
|
exitHandler(SHUTDOWN_STANDBY);
|
||||||
|
}
|
||||||
|
|
||||||
// check if we need to start playing the game/banner sound
|
// check if we need to start playing the game/banner sound
|
||||||
// m_gameSelected means we are on the game selected menu
|
// m_gameSelected means we are on the game selected menu
|
||||||
|
@ -151,7 +151,7 @@ bool CMenu::_Boot(void)
|
|||||||
bool cur_sd = m_cfg.getBool("GENERAL", "sd_only");
|
bool cur_sd = m_cfg.getBool("GENERAL", "sd_only");
|
||||||
if(prev_load != cur_load || prev_ios != cur_ios || set_port != currentPort || prev_sd != cur_sd)
|
if(prev_load != cur_load || prev_ios != cur_ios || set_port != currentPort || prev_sd != cur_sd)
|
||||||
{
|
{
|
||||||
error(_t("errboot8", L"Rebooting ..."));
|
error(_t("errboot8", L"Press 'A' to reload WiiFlow"));
|
||||||
m_exit = true;
|
m_exit = true;
|
||||||
m_reload = true;
|
m_reload = true;
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -66,7 +66,7 @@ void CMenu::_showConfig7(int curPage)
|
|||||||
if(m_config7LblUser[i] != -1)
|
if(m_config7LblUser[i] != -1)
|
||||||
m_btnMgr.show(m_config7LblUser[i]);
|
m_btnMgr.show(m_config7LblUser[i]);
|
||||||
|
|
||||||
if(curPage == 12)
|
/*if(curPage == 12)
|
||||||
{
|
{
|
||||||
m_btnMgr.show(m_config7Lbl1);
|
m_btnMgr.show(m_config7Lbl1);
|
||||||
m_btnMgr.show(m_config7Btn1);
|
m_btnMgr.show(m_config7Btn1);
|
||||||
@ -76,7 +76,7 @@ void CMenu::_showConfig7(int curPage)
|
|||||||
m_btnMgr.show(m_config7Btn3);
|
m_btnMgr.show(m_config7Btn3);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{*/
|
||||||
m_btnMgr.show(m_config7Lbl1);
|
m_btnMgr.show(m_config7Lbl1);
|
||||||
m_btnMgr.show(m_config7Btn1);
|
m_btnMgr.show(m_config7Btn1);
|
||||||
m_btnMgr.show(m_config7Lbl2);
|
m_btnMgr.show(m_config7Lbl2);
|
||||||
@ -85,7 +85,7 @@ void CMenu::_showConfig7(int curPage)
|
|||||||
m_btnMgr.show(m_config7Btn3);
|
m_btnMgr.show(m_config7Btn3);
|
||||||
m_btnMgr.show(m_config7Lbl4);
|
m_btnMgr.show(m_config7Lbl4);
|
||||||
|
|
||||||
if(curPage == 7 || curPage == 11)
|
if(curPage == 7 || curPage == 11 || curPage == 12)
|
||||||
m_btnMgr.show(m_config7Btn4);
|
m_btnMgr.show(m_config7Btn4);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -93,7 +93,7 @@ void CMenu::_showConfig7(int curPage)
|
|||||||
m_btnMgr.show(m_config7Btn4M);
|
m_btnMgr.show(m_config7Btn4M);
|
||||||
m_btnMgr.show(m_config7Btn4P);
|
m_btnMgr.show(m_config7Btn4P);
|
||||||
}
|
}
|
||||||
}
|
//}
|
||||||
|
|
||||||
if(curPage == 7)
|
if(curPage == 7)
|
||||||
{
|
{
|
||||||
@ -158,6 +158,8 @@ void CMenu::_showConfig7(int curPage)
|
|||||||
m_btnMgr.setText(m_config7Btn2, _t("cfg14", L"Set"));
|
m_btnMgr.setText(m_config7Btn2, _t("cfg14", L"Set"));
|
||||||
m_btnMgr.setText(m_config7Lbl3, _t("cfg724", L"Lock coverflow layouts"));
|
m_btnMgr.setText(m_config7Lbl3, _t("cfg724", L"Lock coverflow layouts"));
|
||||||
m_btnMgr.setText(m_config7Btn3, m_cfg.getBool("general", "cf_locked") ? _t("yes", L"Yes") : _t("no", L"No"));
|
m_btnMgr.setText(m_config7Btn3, m_cfg.getBool("general", "cf_locked") ? _t("yes", L"Yes") : _t("no", L"No"));
|
||||||
|
m_btnMgr.setText(m_config7Lbl4, _t("cfg725", L"Shutdown to idle standby"));
|
||||||
|
m_btnMgr.setText(m_config7Btn4, m_cfg.getBool("general", "idle_standby", false) ? _t("yes", L"Yes") : _t("no", L"No"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -327,6 +329,12 @@ int CMenu::_config7(int curPage)
|
|||||||
m_btnMgr.setText(m_config7Btn3, val ? _t("yes", L"Yes") : _t("no", L"No"));
|
m_btnMgr.setText(m_config7Btn3, val ? _t("yes", L"Yes") : _t("no", L"No"));
|
||||||
CFLocked = val;
|
CFLocked = val;
|
||||||
}
|
}
|
||||||
|
else if(m_btnMgr.selected(m_config7Btn4))
|
||||||
|
{
|
||||||
|
bool val = !m_cfg.getBool("general", "idle_standby");
|
||||||
|
m_cfg.setBool("general", "idle_standby", val);
|
||||||
|
m_btnMgr.setText(m_config7Btn4, val ? _t("yes", L"Yes") : _t("no", L"No"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -66,6 +66,7 @@ cfg721=Play GC default sound
|
|||||||
cfg722=Homebrew settings
|
cfg722=Homebrew settings
|
||||||
cfg723=Source menu settings
|
cfg723=Source menu settings
|
||||||
cfg724=Lock coverflow layouts
|
cfg724=Lock coverflow layouts
|
||||||
|
cfg725=Shutdown to idle standby
|
||||||
cfga2=Install game
|
cfga2=Install game
|
||||||
cfga3=Install
|
cfga3=Install
|
||||||
cfga6=Language
|
cfga6=Language
|
||||||
@ -318,7 +319,7 @@ errboot4=No apps/wiiflow directory found!
|
|||||||
errboot5=data_on_usb=yes and no available usb partitions for data!\nUsing SD.
|
errboot5=data_on_usb=yes and no available usb partitions for data!\nUsing SD.
|
||||||
errboot6=No available usb partitions for data and no SD inserted!\nExiting.
|
errboot6=No available usb partitions for data and no SD inserted!\nExiting.
|
||||||
errboot7=Access denied in Wii VC mode.
|
errboot7=Access denied in Wii VC mode.
|
||||||
errboot8=Rebooting ...
|
errboot8=Press 'A' to reload WiiFlow
|
||||||
errgame1=Cannot find the game with ID: %s
|
errgame1=Cannot find the game with ID: %s
|
||||||
errgame2=No cIOS found!
|
errgame2=No cIOS found!
|
||||||
errgame4=Couldn't load IOS %i
|
errgame4=Couldn't load IOS %i
|
||||||
|
Loading…
Reference in New Issue
Block a user