Fri, 20 Nov 2015 22:43:50 +0100
Dialog updates only
brewpanel/dlgBrew.c | file | annotate | diff | comparison | revisions |
--- a/brewpanel/dlgBrew.c Fri Nov 20 20:49:58 2015 +0100 +++ b/brewpanel/dlgBrew.c Fri Nov 20 22:43:50 2015 +0100 @@ -67,9 +67,11 @@ { SGBUTTON, 0, 0, 170, 195, 30, 30, (char *)"23" }, { SGBUTTON, 0, 0, 230, 195, 30, 30, (char *)"34" }, { SGBUTTON, 0, 0, 170, 255, 30, 30, (char *)"All" }, - { SGLEDRED, 0, 0, 110, 300, 12, 0, NULL }, - { SGLEDBLUE, 0, 0, 170, 300, 12, 0, NULL }, - { SGLEDYELLOW, 0, 0, 230, 300, 12, 0, NULL }, + { SGLEDRED, 0, 0, 100, 350, 12, 0, NULL }, + { SGTTF, 0, 0, 60, 365, 20, 20, (char *)"HLT heat" }, + { SGLEDBLUE, 0, 0, 190, 350, 12, 0, NULL }, + { SGLEDYELLOW, 0, 0, 280, 350, 12, 0, NULL }, + { SGTTF, 0, 0, 170, 365, 20, 20, (char *)"heat MLT pump" }, { -1, 0, 0, 0, 0, 0, 0, NULL } }; @@ -77,11 +79,8 @@ int Dialog_LCDinit(int *x, int *y, int *w, int *h, int *cols, int *rows, int index) { - int retval; + int retval = SDLGui_LCDinit(maindlg, x, y, w, h, cols, rows, index); - retval = SDLGui_LCDinit(maindlg, x, y, w, h, cols, rows, index); - - fprintf(stdout, "SDLGui_LCDinit(maindlg, %d, %d, %d, %d, %d, %d, %d) = %d\n", *x, *y, *w, *h, *cols, *rows, index, retval); return retval; } @@ -106,6 +105,9 @@ bOldMouseVisibility = SDL_ShowCursor(SDL_QUERY); SDL_ShowCursor(SDL_ENABLE); + /* + * Patch the main dialog if the fermenter panel should be shown. + */ if (fermenter == 1) { maindlg[1].w = 16; maindlg[1].h = 2; @@ -126,7 +128,7 @@ do { retbut = SDLGui_DoDialogLoop(maindlg); - fprintf(stdout, "SDLGui_DoDialog retbut=%d\n", retbut); +// fprintf(stdout, "SDLGui_DoDialog retbut=%d\n", retbut); switch (retbut) { case MAINDLG_B1 + 1000: