X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/45175c193f968a093da12f6327eb82b22a0ff50d..a8f5cf18bfbafa9f0850df2f6a1de60d89e820bb:/main/enigma.cpp diff --git a/main/enigma.cpp b/main/enigma.cpp index d53955ab..0d1ce6ec 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -145,6 +145,8 @@ public: eLabel *lcd_label, *lcd_clock; +int exit_code; + int main(int argc, char **argv) { #ifdef OBJECT_DEBUG @@ -180,11 +182,11 @@ int main(int argc, char **argv) eWidgetDesktop dsk(eSize(720, 576)); eWidgetDesktop dsk_lcd(eSize(132, 64)); - if (double_buffer) +/* if (double_buffer) { eDebug(" - double buffering found, enable buffered graphics mode."); dsk.setCompositionMode(eWidgetDesktop::cmBuffered); - } + } */ wdsk = &dsk; lcddsk = &dsk_lcd; @@ -215,16 +217,17 @@ int main(int argc, char **argv) lcd_win->resize(eSize(132, 64)); lcd_label = new eLabel(lcd_win); - lcd_label->move(ePoint(0, 10)); - lcd_label->resize(eSize(132, 36)); - ePtr font = new gFont("Arial", 16); + lcd_label->move(ePoint(0, 4)); + lcd_label->resize(eSize(132, 42)); + ePtr font = new gFont("Arial", 19); + //ePtr font = new gFont("Arial", 16); lcd_label->setFont(font); lcd_clock = new eLabel(lcd_win); lcd_clock->move(ePoint(50, 46)); - lcd_clock->resize(eSize(132, 20)); - //ePtr clkfont = new gFont("Arial", 18); - lcd_clock->setFont(font); + lcd_clock->resize(eSize(132, 18)); + ePtr clkfont = new gFont("Arial", 16); + lcd_clock->setFont(clkfont); //lcd_label->setText("bla bla bla, this lcd\nSUCKS!"); //lcd_clock->setText("88:88:88"); @@ -239,7 +242,7 @@ int main(int argc, char **argv) // eApp->exec(); - return 0; + return exit_code; } eWidgetDesktop *getDesktop() @@ -249,12 +252,12 @@ eWidgetDesktop *getDesktop() void runMainloop() { - eApp->exec(); + exit_code = eApp->exec(); } -void quitMainloop() +void quitMainloop(int exitCode) { - eApp->quit(0); + eApp->quit(exitCode); } void setLCD(const char *string)