Small improvements

This commit is contained in:
XorTroll 2019-11-10 00:50:10 +01:00
parent 2d4d7c46ca
commit 3ebb0e8ecd
3 changed files with 21 additions and 10 deletions

View file

@ -3,7 +3,8 @@
"no": "No",
"ok": "Ok",
"cancel": "Cancel",
"multiselect": "Multiselect",
"menu_multiselect": "Multiselect",
"menu_multiselect_cancel": "Multiselect was cancelled.",
"hb_mode_entries_add": "Would you like to add all selected entries to the main menu?",
"hb_mode_entries_added": "New entries were added to main menu.",
"menu_move_to_folder": "Would you like to move all selected entries inside a new folder or an already existing one?",
@ -28,7 +29,7 @@
"app_launch": "Title launch",
"app_unexpected_error": "A title failed to start, crashed or unexpectedly terminated. (Could it be corrupted? If it is a gamecard title, do you have it inserted?)",
"ulaunch_about": "About uLaunch",
"ulaunch_desc": "uLaunch is a custom, FOSS, fully featured and homebrew-oriented HOME menu reimplementation for Nintendo Switch.",
"ulaunch_desc": "uLaunch is a FOSS, extended and homebrew-oriented HOME menu reimplementation.",
"ulaunch_contribute": "If you would like to contribute, check uLaunch's GitHub repository",
"control_minus": "Swap the main menu",
"control_x": "Close title if suspended",
@ -44,7 +45,7 @@
"user_selected": "Selected user",
"user_option": "What would you like to do with this user?",
"user_pass_reg": "Register password",
"user_pass_ch": "Change password",
"user_pass_ch": "Manage password",
"user_view_page": "View user page",
"user_logoff": "Log off",
"user_pass_ch_option": "What would you like to do with the user's password?",

View file

@ -154,7 +154,7 @@ namespace ui
if(index < list.folders.size())
{
auto &folder = list.folders[index];
auto sopt = qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "multiselect"), cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_existing_folder_conf"), { cfg::GetLanguageString(config.main_lang, config.default_lang, "yes"), cfg::GetLanguageString(config.main_lang, config.default_lang, "no"), cfg::GetLanguageString(config.main_lang, config.default_lang, "cancel") }, true);
auto sopt = qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_multiselect"), cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_existing_folder_conf"), { cfg::GetLanguageString(config.main_lang, config.default_lang, "yes"), cfg::GetLanguageString(config.main_lang, config.default_lang, "no"), cfg::GetLanguageString(config.main_lang, config.default_lang, "cancel") }, true);
if(sopt == 0) this->HandleMultiselectMoveToFolder(folder.name);
else if(sopt == 1) this->StopMultiselect();
}
@ -168,7 +168,11 @@ namespace ui
}
else
{
if(down & KEY_B) this->StopMultiselect();
if(down & KEY_B)
{
qapp->ShowNotification(cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_multiselect_cancel"));
this->StopMultiselect();
}
else if(down & KEY_Y)
{
bool selectable = false;
@ -187,7 +191,7 @@ namespace ui
{
if(this->homebrew_mode)
{
auto sopt = qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "multiselect"), cfg::GetLanguageString(config.main_lang, config.default_lang, "hb_mode_entries_add"), { cfg::GetLanguageString(config.main_lang, config.default_lang, "yes"), cfg::GetLanguageString(config.main_lang, config.default_lang, "no"), cfg::GetLanguageString(config.main_lang, config.default_lang, "cancel") }, true);
auto sopt = qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_multiselect"), cfg::GetLanguageString(config.main_lang, config.default_lang, "hb_mode_entries_add"), { cfg::GetLanguageString(config.main_lang, config.default_lang, "yes"), cfg::GetLanguageString(config.main_lang, config.default_lang, "no"), cfg::GetLanguageString(config.main_lang, config.default_lang, "cancel") }, true);
if(sopt == 0)
{
// Get the idx of the last homebrew element.
@ -221,7 +225,7 @@ namespace ui
}
else if(this->curfolder.empty())
{
auto sopt = qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "multiselect"), cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_to_folder"), { cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_new_folder"), cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_existing_folder"), cfg::GetLanguageString(config.main_lang, config.default_lang, "no"), cfg::GetLanguageString(config.main_lang, config.default_lang, "cancel") }, true);
auto sopt = qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_multiselect"), cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_to_folder"), { cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_new_folder"), cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_existing_folder"), cfg::GetLanguageString(config.main_lang, config.default_lang, "no"), cfg::GetLanguageString(config.main_lang, config.default_lang, "cancel") }, true);
if(sopt == 0)
{
SwkbdConfig swkbd;
@ -241,7 +245,7 @@ namespace ui
}
else
{
auto sopt = qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "multiselect"), cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_from_folder"), { cfg::GetLanguageString(config.main_lang, config.default_lang, "yes"), cfg::GetLanguageString(config.main_lang, config.default_lang, "no"), cfg::GetLanguageString(config.main_lang, config.default_lang, "cancel") }, true);
auto sopt = qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_multiselect"), cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_move_from_folder"), { cfg::GetLanguageString(config.main_lang, config.default_lang, "yes"), cfg::GetLanguageString(config.main_lang, config.default_lang, "no"), cfg::GetLanguageString(config.main_lang, config.default_lang, "cancel") }, true);
if(sopt == 0)
{
u32 rmvd = 0;
@ -724,13 +728,17 @@ namespace ui
{
pu::audio::Play(this->sfxMenuToggle);
this->homebrew_mode = !this->homebrew_mode;
if(this->select_on) this->StopMultiselect();
if(this->select_on)
{
qapp->ShowNotification(cfg::GetLanguageString(config.main_lang, config.default_lang, "menu_multiselect_cancel"));
this->StopMultiselect();
}
this->MoveFolder("", true);
}
void MenuLayout::logo_Click()
{
qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "ulaunch_about"), "uLaunch v" + std::string(Q_VERSION) + "\n\n" + cfg::GetLanguageString(config.main_lang, config.default_lang, "ulaunch_about") + "\n\n" + cfg::GetLanguageString(config.main_lang, config.default_lang, "ulaunch_contribute") + ":\nhttps://github.com/XorTroll/uLaunch", { cfg::GetLanguageString(config.main_lang, config.default_lang, "ok") }, true, "romfs:/LogoLarge.png");
qapp->CreateShowDialog(cfg::GetLanguageString(config.main_lang, config.default_lang, "ulaunch_about"), "uLaunch v" + std::string(Q_VERSION) + "\n\n" + cfg::GetLanguageString(config.main_lang, config.default_lang, "ulaunch_desc") + "\n\n" + cfg::GetLanguageString(config.main_lang, config.default_lang, "ulaunch_contribute") + ":\nhttps://github.com/XorTroll/uLaunch", { cfg::GetLanguageString(config.main_lang, config.default_lang, "ok") }, true, "romfs:/LogoLarge.png");
qapp->ShowNotification("(-) -> " + cfg::GetLanguageString(config.main_lang, config.default_lang, "control_minus") + " | (X) -> " + cfg::GetLanguageString(config.main_lang, config.default_lang, "control_x") + " | (Y) -> " + cfg::GetLanguageString(config.main_lang, config.default_lang, "control_y") + " | (L), (R), (ZL), (ZR) -> " + cfg::GetLanguageString(config.main_lang, config.default_lang, "control_zlr"), 3500);
}

View file

@ -112,6 +112,8 @@ This is the same process but, like in normal HOME menu and Album, it runs homebr
*QDaemon* daemon process, appart from usual (and special) HOME menu functions, it also sends the console's foreground display via USB as a raw RGBA8 1280x720 ~3MB buffer. **QForegroundViewer** is the PC tool (WinForms) which intercepts those sent buffers and renders them. It is a bit laggy, but can be *very* useful for taking quick screenshots!
This tool was used to take the screenshots shown above, all in full 1280x720 quality.
Unlike the other projects, this one isn't essential and uLaunch would be perfectly usable ignoring this sent data.
For more technical information about uLaunch and qlaunch, check [this](HOME.md).