mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the message-box 'OK' text into language.c. Display the Result from envGetLastLoadResult() with a message-box when required.

Browse Source
This commit is contained in:
yellows8 2018-03-11 17:43:36 -04:00
parent 27d195e118
commit 9aaac6f01e
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/language.c
View File

@ -211,6 +211,11 @@ const char* const g_strings[StrId_Max][16] =
),
},
[StrId_LastLoadResult] =
{
STR_EN("The last application returned an error:"),
},
[StrId_AppInfo_Author] =
{
STR_EN("Author"),
@ -281,6 +286,11 @@ const char* const g_strings[StrId_Max][16] =
STR_DE("Zurück"),
},
[StrId_MsgBox_OK] =
{
STR_EN("OK"),
},
/*[StrId_Reboot] =
{
STR_EN(

4
common/language.h
View File

@ -14,12 +14,16 @@ typedef enum
StrId_NoAppsFound_Title,
StrId_NoAppsFound_Msg,
StrId_LastLoadResult,
StrId_AppInfo_Author,
StrId_AppInfo_Version,
StrId_Actions_Launch,
StrId_Actions_Open,
StrId_Actions_Back,
StrId_MsgBox_OK,
StrId_Reboot,
StrId_ReturnToHome,

2
common/message-box.c
View File

@ -127,7 +127,7 @@ void menuDrawMsgBox() {
DrawText(interuiregular18, start_x + (currMsgBox.width - text_width) / 2, start_y + (currMsgBox.height - text_height - 80) / 2, MakeColor(0, 0, 0, 255), currMsgBox.text);
}
DrawText(interuimedium20, start_x + 365, start_y + 245, MakeColor(0, 0, 0, 255), "OK");
DrawText(interuimedium20, start_x + 365, start_y + 245, MakeColor(0, 0, 0, 255), textGetString(StrId_MsgBox_OK));
shadow_start_y = start_y + currMsgBox.height;

12
nx_main/main.c
View File

@ -14,6 +14,9 @@ u64 g_tickdiff_frame=0;
int main(int argc, char **argv)
{
Result lastret=0;
char msg[256];
#ifdef PERF_LOG
u64 start_tick=0;
#endif
@ -31,6 +34,15 @@ int main(int argc, char **argv)
launchInit();
lastret = envGetLastLoadResult();
if (R_FAILED(lastret)) {
memset(msg, 0, sizeof(msg));
snprintf(msg, sizeof(msg)-1, "%s\n0x%x", textGetString(StrId_LastLoadResult), lastret);
menuCreateMsgBox(780, 300, msg);
}
#ifdef PERF_LOG
gfxWaitForVsync();