- config source using main config buttons.

- parental lock for source menu editor added.
This commit is contained in:
Fledge68 2022-07-01 17:36:03 -05:00
parent 172bb46207
commit 24e5e28abb
10 changed files with 58 additions and 101 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.3 MiB

View File

@ -1275,7 +1275,7 @@ void CMenu::_buildMenus(void)
_initGameSettingsMenu(); _initGameSettingsMenu();
_initCheatSettingsMenu(); _initCheatSettingsMenu();
_initSourceMenu(); _initSourceMenu();
_initCfgSrc(); _initConfigSrc();
_initConfigHB(); _initConfigHB();
_initPluginSettingsMenu(); _initPluginSettingsMenu();
_initCategorySettingsMenu(); _initCategorySettingsMenu();
@ -1981,6 +1981,7 @@ void CMenu::_updateText(void)
_textConfigGC(); _textConfigGC();
_textPartitionsCfg(); _textPartitionsCfg();
_textConfigHB(); _textConfigHB();
_textConfigSrc();
_textGame(); _textGame();
_textDownload(); _textDownload();
_textCode(); _textCode();

View File

@ -882,7 +882,7 @@ private:
void _initGameSettingsMenu(); void _initGameSettingsMenu();
void _initCheatSettingsMenu(); void _initCheatSettingsMenu();
void _initSourceMenu(); void _initSourceMenu();
void _initCfgSrc(); void _initConfigSrc();
void _initConfigHB(); void _initConfigHB();
void _initPluginSettingsMenu(); void _initPluginSettingsMenu();
void _initCategorySettingsMenu(); void _initCategorySettingsMenu();
@ -896,7 +896,7 @@ private:
void _initCheckboxesMenu(); void _initCheckboxesMenu();
// //
void _textSource(void); void _textSource(void);
void _textCfgSrc(void); void _textConfigSrc(void);
void _textConfigHB(void); void _textConfigHB(void);
void _textPluginSettings(void); void _textPluginSettings(void);
void _textCategorySettings(void); void _textCategorySettings(void);
@ -930,6 +930,7 @@ private:
void _hideConfigButtons(bool instant = false); void _hideConfigButtons(bool instant = false);
void _hideConfigGC(bool instant = true); void _hideConfigGC(bool instant = true);
void _hideConfigHB(bool instant = true); void _hideConfigHB(bool instant = true);
void _hideConfigSrc(bool instant = true);
void _hidePartitionsCfg(bool instant = false); void _hidePartitionsCfg(bool instant = false);
void _hideGame(bool instant = false); void _hideGame(bool instant = false);
void _hideDownload(bool instant = false); void _hideDownload(bool instant = false);
@ -962,6 +963,7 @@ private:
void _showConfigMain(int curPage); void _showConfigMain(int curPage);
void _showConfigGC(int curPage); void _showConfigGC(int curPage);
void _showConfigHB(void); void _showConfigHB(void);
void _showConfigSrc(bool m_sourceflow = false);
void _showPartitionsCfg(void); void _showPartitionsCfg(void);
void _showNandEmu(void); void _showNandEmu(void);
void _showGame(void); void _showGame(void);
@ -1012,6 +1014,8 @@ private:
// //
void _configMain(void); void _configMain(void);
void _configGC(void); void _configGC(void);
void _ConfigSrc();
void _ConfigHB();
void _partitionsCfg(void); void _partitionsCfg(void);
int _NandEmuCfg(void); int _NandEmuCfg(void);
int _AutoExtractSave(string gameId); int _AutoExtractSave(string gameId);
@ -1034,8 +1038,6 @@ private:
void _Wad(const char *wad_path = NULL); void _Wad(const char *wad_path = NULL);
void _CheatSettings(); void _CheatSettings();
bool _Source(); bool _Source();
void _CfgSrc();
void _ConfigHB();
void _PluginSettings(); void _PluginSettings();
void _checkboxesMenu(u8 md); void _checkboxesMenu(u8 md);
void _SM_Editor(); void _SM_Editor();

View File

@ -881,7 +881,7 @@ void CMenu::_configMain(void)
else if(m_btnMgr.selected(m_configBtn2)) else if(m_btnMgr.selected(m_configBtn2))
{ {
_hideConfigMain(); _hideConfigMain();
_CfgSrc(); _ConfigSrc();
_showConfigMain(12); _showConfigMain(12);
} }
else if(m_btnMgr.selected(m_configBtn3)) else if(m_btnMgr.selected(m_configBtn3))

View File

@ -5,21 +5,9 @@ s16 m_cfgsrcLblTitle;
s16 m_cfgsrcBtnBack; s16 m_cfgsrcBtnBack;
s16 m_cfgsrcLblUser[4]; s16 m_cfgsrcLblUser[4];
s16 m_cfgsrcLblEnableSF;
s16 m_cfgsrcBtnEnableSF;
s16 m_cfgsrcLblSmallbox;
s16 m_cfgsrcBtnSmallbox;
s16 m_cfgsrcLblBoxMode;
s16 m_cfgsrcBtnBoxMode;
s16 m_cfgsrcLblAdjustCF;
s16 m_cfgsrcBtnAdjustCF;
TexData m_cfgsrcBg; TexData m_cfgsrcBg;
static void _hideCfgSrc(bool instant) void CMenu::_hideConfigSrc(bool instant)
{ {
m_btnMgr.hide(m_cfgsrcLblTitle, instant); m_btnMgr.hide(m_cfgsrcLblTitle, instant);
m_btnMgr.hide(m_cfgsrcBtnBack, instant); m_btnMgr.hide(m_cfgsrcBtnBack, instant);
@ -27,55 +15,50 @@ static void _hideCfgSrc(bool instant)
if(m_cfgsrcLblUser[i] != -1) if(m_cfgsrcLblUser[i] != -1)
m_btnMgr.hide(m_cfgsrcLblUser[i], instant); m_btnMgr.hide(m_cfgsrcLblUser[i], instant);
m_btnMgr.hide(m_cfgsrcLblEnableSF, instant); _hideConfigButtons(instant);
m_btnMgr.hide(m_cfgsrcBtnEnableSF, instant);
m_btnMgr.hide(m_cfgsrcLblSmallbox, instant);
m_btnMgr.hide(m_cfgsrcBtnSmallbox, instant);
m_btnMgr.hide(m_cfgsrcLblBoxMode, instant);
m_btnMgr.hide(m_cfgsrcBtnBoxMode, instant);
m_btnMgr.hide(m_cfgsrcLblAdjustCF, instant);
m_btnMgr.hide(m_cfgsrcBtnAdjustCF, instant);
} }
static void _showCfgSrc(bool m_sourceflow) void CMenu::_showConfigSrc(bool m_sourceflow)
{ {
_setBg(m_cfgsrcBg, m_cfgsrcBg);
m_btnMgr.show(m_cfgsrcLblTitle); m_btnMgr.show(m_cfgsrcLblTitle);
m_btnMgr.show(m_cfgsrcBtnBack); m_btnMgr.show(m_cfgsrcBtnBack);
for(u8 i = 0; i < ARRAY_SIZE(m_cfgsrcLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_cfgsrcLblUser); ++i)
if(m_cfgsrcLblUser[i] != -1) if(m_cfgsrcLblUser[i] != -1)
m_btnMgr.show(m_cfgsrcLblUser[i]); m_btnMgr.show(m_cfgsrcLblUser[i]);
m_btnMgr.show(m_cfgsrcLblEnableSF); m_btnMgr.setText(m_configBtn1, m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled") ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.show(m_cfgsrcBtnEnableSF); m_btnMgr.show(m_configLbl1);
m_btnMgr.show(m_configBtn1);
if(m_sourceflow) if(m_sourceflow)
{ {
m_btnMgr.show(m_cfgsrcLblSmallbox); m_btnMgr.setText(m_configBtn2, m_cfg.getBool(SOURCEFLOW_DOMAIN, "smallbox") ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.show(m_cfgsrcBtnSmallbox); m_btnMgr.setText(m_configBtn3, m_cfg.getBool(SOURCEFLOW_DOMAIN, "box_mode") ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.show(m_cfgsrcLblBoxMode); m_btnMgr.show(m_configLbl2);
m_btnMgr.show(m_cfgsrcBtnBoxMode); m_btnMgr.show(m_configBtn2);
m_btnMgr.show(m_cfgsrcLblAdjustCF); m_btnMgr.show(m_configLbl3);
m_btnMgr.show(m_cfgsrcBtnAdjustCF); m_btnMgr.show(m_configBtn3);
m_btnMgr.show(m_configLbl4);
m_btnMgr.show(m_configBtn4);
} }
else else
{ {
m_btnMgr.hide(m_cfgsrcLblSmallbox, true); m_btnMgr.hide(m_configLbl2, true);
m_btnMgr.hide(m_cfgsrcBtnSmallbox, true); m_btnMgr.hide(m_configBtn2, true);
m_btnMgr.hide(m_cfgsrcLblBoxMode, true); m_btnMgr.hide(m_configLbl3, true);
m_btnMgr.hide(m_cfgsrcBtnBoxMode, true); m_btnMgr.hide(m_configBtn3, true);
m_btnMgr.hide(m_cfgsrcLblAdjustCF, true); m_btnMgr.hide(m_configLbl4, true);
m_btnMgr.hide(m_cfgsrcBtnAdjustCF, true); m_btnMgr.hide(m_configBtn4, true);
} }
} }
void CMenu::_CfgSrc(void) void CMenu::_ConfigSrc(void)
{ {
if(!m_use_source) if(!m_use_source)
{ {
@ -83,11 +66,7 @@ void CMenu::_CfgSrc(void)
return; return;
} }
SetupInput(); SetupInput();
_setBg(m_cfgsrcBg, m_cfgsrcBg); _showConfigSrc(m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled", false));
m_btnMgr.setText(m_cfgsrcBtnEnableSF, m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled") ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.setText(m_cfgsrcBtnSmallbox, m_cfg.getBool(SOURCEFLOW_DOMAIN, "smallbox") ? _t("on", L"On") : _t("off", L"Off"));
m_btnMgr.setText(m_cfgsrcBtnBoxMode, m_cfg.getBool(SOURCEFLOW_DOMAIN, "box_mode") ? _t("on", L"On") : _t("off", L"Off"));
_showCfgSrc(m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled", false));
bool temp; bool temp;
while(!m_exit) while(!m_exit)
@ -103,43 +82,42 @@ void CMenu::_CfgSrc(void)
{ {
if(m_btnMgr.selected(m_cfgsrcBtnBack)) if(m_btnMgr.selected(m_cfgsrcBtnBack))
break; break;
else if(m_btnMgr.selected(m_cfgsrcBtnEnableSF)) else if(m_btnMgr.selected(m_configBtn1))
{ {
temp = !m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled", false); temp = !m_cfg.getBool(SOURCEFLOW_DOMAIN, "enabled", false);
m_cfg.setBool(SOURCEFLOW_DOMAIN, "enabled", temp); m_cfg.setBool(SOURCEFLOW_DOMAIN, "enabled", temp);
m_btnMgr.setText(m_cfgsrcBtnEnableSF, temp ? _t("on", L"On") : _t("off", L"Off")); _showConfigSrc(temp);
_showCfgSrc(temp);
} }
else if(m_btnMgr.selected(m_cfgsrcBtnSmallbox)) else if(m_btnMgr.selected(m_configBtn2))
{ {
SF_cacheCovers = true; SF_cacheCovers = true;
temp = !m_cfg.getBool(SOURCEFLOW_DOMAIN, "smallbox", false); temp = !m_cfg.getBool(SOURCEFLOW_DOMAIN, "smallbox", false);
m_cfg.setBool(SOURCEFLOW_DOMAIN, "smallbox", temp); m_cfg.setBool(SOURCEFLOW_DOMAIN, "smallbox", temp);
m_btnMgr.setText(m_cfgsrcBtnSmallbox, temp ? _t("on", L"On") : _t("off", L"Off")); m_btnMgr.setText(m_configBtn2, temp ? _t("on", L"On") : _t("off", L"Off"));
} }
else if(m_btnMgr.selected(m_cfgsrcBtnBoxMode)) else if(m_btnMgr.selected(m_configBtn3))
{ {
SF_cacheCovers = true; SF_cacheCovers = true;
temp = !m_cfg.getBool(SOURCEFLOW_DOMAIN, "box_mode", false); temp = !m_cfg.getBool(SOURCEFLOW_DOMAIN, "box_mode", false);
m_cfg.setBool(SOURCEFLOW_DOMAIN, "box_mode", temp); m_cfg.setBool(SOURCEFLOW_DOMAIN, "box_mode", temp);
m_btnMgr.setText(m_cfgsrcBtnBoxMode, temp ? _t("on", L"On") : _t("off", L"Off")); m_btnMgr.setText(m_configBtn3, temp ? _t("on", L"On") : _t("off", L"Off"));
} }
else if(m_btnMgr.selected(m_cfgsrcBtnAdjustCF)) else if(m_btnMgr.selected(m_configBtn4))
{ {
_hideCfgSrc(true); _hideConfigSrc(true);
m_sourceflow = true; m_sourceflow = true;
_showCF(true); _showCF(true);
_cfTheme(); _cfTheme();
m_sourceflow = false; m_sourceflow = false;
_showCF(true); _showCF(true);
_showCfgSrc(true); _showConfigSrc(true);
} }
} }
} }
_hideCfgSrc(false); _hideConfigSrc(true);
} }
void CMenu::_initCfgSrc(void) void CMenu::_initConfigSrc(void)
{ {
m_cfgsrcBg = _texture("CFG_SRC/BG", "texture", theme.bg, false); m_cfgsrcBg = _texture("CFG_SRC/BG", "texture", theme.bg, false);
@ -147,44 +125,20 @@ void CMenu::_initCfgSrc(void)
m_cfgsrcLblTitle = _addLabel("CFG_SRC/TITLE", theme.titleFont, L"", 0, 10, 640, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE); m_cfgsrcLblTitle = _addLabel("CFG_SRC/TITLE", theme.titleFont, L"", 0, 10, 640, 60, theme.titleFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE);
m_cfgsrcBtnBack = _addButton("CFG_SRC/BACK_BTN", theme.btnFont, L"", 420, 400, 200, 48, theme.btnFontColor); m_cfgsrcBtnBack = _addButton("CFG_SRC/BACK_BTN", theme.btnFont, L"", 420, 400, 200, 48, theme.btnFontColor);
m_cfgsrcLblEnableSF = _addLabel("CFG_SRC/ENABLE_SF", theme.lblFont, L"", 20, 125, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_cfgsrcBtnEnableSF = _addButton("CFG_SRC/ENABLE_SF_BTN", theme.btnFont, L"", 420, 130, 200, 48, theme.btnFontColor);
m_cfgsrcLblSmallbox = _addLabel("CFG_SRC/SF_SMALLBOX", theme.lblFont, L"", 20, 185, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_cfgsrcBtnSmallbox = _addButton("CFG_SRC/SF_SMALLBOX_BTN", theme.btnFont, L"", 420, 190, 200, 48, theme.btnFontColor);
m_cfgsrcLblBoxMode = _addLabel("CFG_SRC/SF_BOXMODE", theme.lblFont, L"", 20, 245, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_cfgsrcBtnBoxMode = _addButton("CFG_SRC/SF_BOXMODE_BTN", theme.btnFont, L"", 420, 250, 200, 48, theme.btnFontColor);
m_cfgsrcLblAdjustCF = _addLabel("CFG_SRC/SF_ADJUSTCF", theme.lblFont, L"", 20, 305, 385, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
m_cfgsrcBtnAdjustCF = _addButton("CFG_SRC/SF_ADJUSTCF_BTN", theme.btnFont, L"", 420, 310, 200, 48, theme.btnFontColor);
_setHideAnim(m_cfgsrcLblTitle, "CFG_SRC/TITLE", 0, 0, -2.f, 0.f); _setHideAnim(m_cfgsrcLblTitle, "CFG_SRC/TITLE", 0, 0, -2.f, 0.f);
_setHideAnim(m_cfgsrcBtnBack, "CFG_SRC/BACK_BTN", 0, 0, 1.f, -1.f); _setHideAnim(m_cfgsrcBtnBack, "CFG_SRC/BACK_BTN", 0, 0, 1.f, -1.f);
_setHideAnim(m_cfgsrcLblEnableSF, "CFG_SRC/ENABLE_SF", -50, 0, -2.f, 0.f); _hideConfigSrc(true);
_setHideAnim(m_cfgsrcBtnEnableSF, "CFG_SRC/ENABLE_SF_BTN", -50, 0, 1.f, 0.f); _textConfigSrc();
_setHideAnim(m_cfgsrcLblSmallbox, "CFG_SRC/SF_SMALLBOX", -50, 0, -2.f, 0.f);
_setHideAnim(m_cfgsrcBtnSmallbox, "CFG_SRC/SF_SMALLBOX_BTN", -50, 0, 1.f, 0.f);
_setHideAnim(m_cfgsrcLblBoxMode, "CFG_SRC/SF_BOXMODE", -50, 0, -2.f, 0.f);
_setHideAnim(m_cfgsrcBtnBoxMode, "CFG_SRC/SF_BOXMODE_BTN", -50, 0, 1.f, 0.f);
_setHideAnim(m_cfgsrcLblAdjustCF, "CFG_SRC/SF_ADJUSTCF", -50, 0, -2.f, 0.f);
_setHideAnim(m_cfgsrcBtnAdjustCF, "CFG_SRC/SF_ADJUSTCF_BTN", -50, 0, 1.f, 0.f);
_hideCfgSrc(true);
_textCfgSrc();
} }
void CMenu::_textCfgSrc(void) void CMenu::_textConfigSrc(void)
{ {
m_btnMgr.setText(m_cfgsrcLblTitle, _t("cfgsm1", L"Sourceflow Settings")); m_btnMgr.setText(m_cfgsrcLblTitle, _t("cfgsm1", L"Sourceflow Settings"));
m_btnMgr.setText(m_cfgsrcLblEnableSF, _t("cfgsm3", L"Enable Sourceflow")); m_btnMgr.setText(m_configLbl1, _t("cfgsm3", L"Enable Sourceflow"));
m_btnMgr.setText(m_cfgsrcLblSmallbox, _t("cfgsm4", L"Sourceflow Smallbox")); m_btnMgr.setText(m_configLbl2, _t("cfgsm4", L"Sourceflow Smallbox"));
m_btnMgr.setText(m_cfgsrcLblBoxMode, _t("cfghb4", L"Box Mode")); m_btnMgr.setText(m_configLbl3, _t("cfghb4", L"Box Mode"));
m_btnMgr.setText(m_cfgsrcLblAdjustCF, _t("cfgc4", L"Adjust Coverflow")); m_btnMgr.setText(m_configLbl4, _t("cfgc4", L"Adjust Coverflow"));
m_btnMgr.setText(m_cfgsrcBtnAdjustCF, _t("cfgc5", L"Go")); m_btnMgr.setText(m_configBtn4, _t("cfgc5", L"Go"));
m_btnMgr.setText(m_cfgsrcBtnBack, _t("cfg10", L"Back")); m_btnMgr.setText(m_cfgsrcBtnBack, _t("cfg10", L"Back"));
} }

View File

@ -464,7 +464,7 @@ int CMenu::main(void)
} }
if(BTN_HOME_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_mainBtnHome))) if(BTN_HOME_PRESSED || (BTN_A_PRESSED && m_btnMgr.selected(m_mainBtnHome)))
{ {
if(m_sourceflow)// open Source Menu Editor Menu if(m_sourceflow && !m_locked)// open Source Menu Editor Menu
{ {
_hideMain(); _hideMain();
_SM_Editor(); _SM_Editor();
@ -1008,7 +1008,7 @@ void CMenu::_initMainMenu()
TexData texFavOffS; TexData texFavOffS;
TexData bgLQ; TexData bgLQ;
TexData emptyTex; TexData emptyTex;
TexData texUser1; //TexData texUser1;
m_mainBg = _texture("MAIN/BG", "texture", theme.bg, false); m_mainBg = _texture("MAIN/BG", "texture", theme.bg, false);
if(m_theme.loaded() && TexHandle.fromImageFile(bgLQ, fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString("MAIN/BG", "texture").c_str()), GX_TF_CMPR, 64, 64) == TE_OK) if(m_theme.loaded() && TexHandle.fromImageFile(bgLQ, fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString("MAIN/BG", "texture").c_str()), GX_TF_CMPR, 64, 64) == TE_OK)
@ -1040,7 +1040,7 @@ void CMenu::_initMainMenu()
TexHandle.fromImageFile(texFavOnS, fmt("%s/gamefavons.png", m_imgsDir.c_str())); TexHandle.fromImageFile(texFavOnS, fmt("%s/gamefavons.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texFavOff, fmt("%s/gamefavoff.png", m_imgsDir.c_str())); TexHandle.fromImageFile(texFavOff, fmt("%s/gamefavoff.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texFavOffS, fmt("%s/gamefavoffs.png", m_imgsDir.c_str())); TexHandle.fromImageFile(texFavOffS, fmt("%s/gamefavoffs.png", m_imgsDir.c_str()));
TexHandle.fromImageFile(texUser1, fmt("%s/mainUser1.png", m_imgsDir.c_str())); //TexHandle.fromImageFile(texUser1, fmt("%s/mainUser1.png", m_imgsDir.c_str()));
_addUserLabels(m_mainLblUser, ARRAY_SIZE(m_mainLblUser), "MAIN"); _addUserLabels(m_mainLblUser, ARRAY_SIZE(m_mainLblUser), "MAIN");

View File

@ -508,7 +508,7 @@ void CMenu::_SM_Editor()
/*else if(m_btnMgr.selected(m_configBtn4)) /*else if(m_btnMgr.selected(m_configBtn4))
{ {
_hideSM_Editor(); _hideSM_Editor();
_CfgSrc(); _ConfigSrc();
_showSM_Editor(); _showSM_Editor();
}*/ }*/
} }

View File

@ -396,7 +396,7 @@ bool CMenu::_Source()
else else
_updateSourceBtns(); _updateSourceBtns();
} }
else if(BTN_HOME_PRESSED) else if(BTN_HOME_PRESSED && !m_locked)
{ {
_hideSource(); _hideSource();
_SM_Editor(); _SM_Editor();

View File

@ -520,7 +520,7 @@ wbfsoperr2=Disc_Open failed
wbfsoperr3=This is not a Wii disc! wbfsoperr3=This is not a Wii disc!
wbfsoperr4=Game already installed wbfsoperr4=Game already installed
wbfsoperr5=Deleting this Channel is not allowed! wbfsoperr5=Deleting this Channel is not allowed!
wbfsoperr6=Install game is broken, please use cleanrip. wbfsoperr6=Install game is broken, \nplease use cleanrip.
wbfsprogress=%i%% wbfsprogress=%i%%
wbfsremdlg=To permanently remove the game: %s, click on Go. wbfsremdlg=To permanently remove the game: %s, click on Go.
wifiplayers=Wifi Players wifiplayers=Wifi Players