rosalina: minor menu changes

This commit is contained in:
TuxSH 2020-07-15 22:24:08 +01:00
parent e096aaabc4
commit 184f4587fb
3 changed files with 26 additions and 8 deletions

View File

@ -63,7 +63,11 @@ Menu rosalinaMenu = {
bool rosalinaMenuShouldShowDebugInfo(void) bool rosalinaMenuShouldShowDebugInfo(void)
{ {
return true; // Don't show on release builds
s64 out;
svcGetSystemInfo(&out, 0x10000, 0x200);
return out == 0;
} }
void RosalinaMenu_ShowDebugInfo(void) void RosalinaMenu_ShowDebugInfo(void)
@ -117,8 +121,8 @@ void RosalinaMenu_ShowCredits(void)
Draw_DrawString(10, posY, COLOR_WHITE, Draw_DrawString(10, posY, COLOR_WHITE,
( (
"Special thanks to:\n" "Special thanks to:\n"
" Bond697, WinterMute, piepie62, yifanlu\n" " fincs, WinterMute, mtheall, piepie62,\n"
" Luma3DS contributors, ctrulib contributors,\n" " Luma3DS contributors, libctru contributors,\n"
" other people" " other people"
)); ));
@ -138,7 +142,7 @@ void RosalinaMenu_Reboot(void)
do do
{ {
Draw_Lock(); Draw_Lock();
Draw_DrawString(10, 10, COLOR_TITLE, "Rosalina menu"); Draw_DrawString(10, 10, COLOR_TITLE, "Reboot");
Draw_DrawString(10, 30, COLOR_WHITE, "Press A to reboot, press B to go back."); Draw_DrawString(10, 30, COLOR_WHITE, "Press A to reboot, press B to go back.");
Draw_FlushFramebuffer(); Draw_FlushFramebuffer();
Draw_Unlock(); Draw_Unlock();
@ -170,7 +174,7 @@ void RosalinaMenu_ChangeScreenBrightness(void)
do do
{ {
Draw_Lock(); Draw_Lock();
Draw_DrawString(10, 10, COLOR_TITLE, "Rosalina menu"); Draw_DrawString(10, 10, COLOR_TITLE, "Screen brightness");
u32 posY = 30; u32 posY = 30;
posY = Draw_DrawFormattedString(10, posY, COLOR_WHITE, "Current luminance: %lu\n\n", luminance); posY = Draw_DrawFormattedString(10, posY, COLOR_WHITE, "Current luminance: %lu\n\n", luminance);
posY = Draw_DrawString(10, posY, COLOR_WHITE, "Controls: Up/Down for +-1, Right/Left for +-10.\n"); posY = Draw_DrawString(10, posY, COLOR_WHITE, "Controls: Up/Down for +-1, Right/Left for +-10.\n");
@ -254,7 +258,7 @@ void RosalinaMenu_PowerOff(void) // Soft shutdown.
do do
{ {
Draw_Lock(); Draw_Lock();
Draw_DrawString(10, 10, COLOR_TITLE, "Rosalina menu"); Draw_DrawString(10, 10, COLOR_TITLE, "Power off");
Draw_DrawString(10, 30, COLOR_WHITE, "Press A to power off, press B to go back."); Draw_DrawString(10, 30, COLOR_WHITE, "Press A to power off, press B to go back.");
Draw_FlushFramebuffer(); Draw_FlushFramebuffer();
Draw_Unlock(); Draw_Unlock();

View File

@ -319,7 +319,21 @@ void MiscellaneousMenu_InputRedirection(void)
else else
{ {
if(res == 0) if(res == 0)
Draw_DrawString(10, 30, COLOR_WHITE, "InputRedirection stopped successfully."); {
u32 posY = 30;
posY = Draw_DrawString(10, posY, COLOR_WHITE, "InputRedirection stopped successfully.\n\n");
if (isN3DS)
{
posY = Draw_DrawString(
10,
posY,
COLOR_WHITE,
"This might cause a key press to be repeated in\n"
"Home Menu for no reason.\n\n"
"Just pressing ZL/ZR on the console is enough to fix\nthis.\n"
);
}
}
else else
Draw_DrawString(10, 30, COLOR_WHITE, buf); Draw_DrawString(10, 30, COLOR_WHITE, buf);
} }

View File

@ -35,10 +35,10 @@
Menu sysconfigMenu = { Menu sysconfigMenu = {
"System configuration menu", "System configuration menu",
{ {
{ "Control Wireless connection", METHOD, .method = &SysConfigMenu_ControlWifi },
{ "Toggle LEDs", METHOD, .method = &SysConfigMenu_ToggleLEDs }, { "Toggle LEDs", METHOD, .method = &SysConfigMenu_ToggleLEDs },
{ "Toggle Wireless", METHOD, .method = &SysConfigMenu_ToggleWireless }, { "Toggle Wireless", METHOD, .method = &SysConfigMenu_ToggleWireless },
{ "Toggle Power Button", METHOD, .method=&SysConfigMenu_TogglePowerButton }, { "Toggle Power Button", METHOD, .method=&SysConfigMenu_TogglePowerButton },
{ "Control Wireless connection", METHOD, .method = &SysConfigMenu_ControlWifi },
{}, {},
} }
}; };