From 8fbc0a431cc25292978323edc2f53bfa9f2c3c96 Mon Sep 17 00:00:00 2001 From: Niklas Date: Mon, 10 Oct 2011 17:07:14 +0200 Subject: corrected some errors --- src/main.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index f3d4201..21983ca 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,6 +6,9 @@ #include #include "loggerengine.h" #include "fbgui.h" +#include "ndgui.h" + +#include "../common/fbgui.h" void printHelp() { QTextStream qout(stdout); @@ -191,15 +194,19 @@ int main(int argc, char *argv[]) { qxtLog->debug() << "*******************************************"; // set invisible cursor - QWSServer::instance()->setCursorVisible(false); + //QWSServer::instance()->setCursorVisible(false); // set default keyboard / mouse drivers. TODO: fix this, doesn't work... //QWSServer::instance()->setDefaultKeyboard("TTY:/dev/tty0"); //QWSServer::instance()->setDefaultMouse("IntelliMouse:/dev/mice"); - // start fbgui - qxtLog->debug() << "Initializing fbgui..."; + + // start ndgui + qxtLog->debug() << "Initializing ndgui..."; + ndgui ngui; fbgui gui; - gui.show(); + + QObject::connect(&ngui, SIGNAL(initFbgui()), &gui, SLOT(init())); + ngui.show(); return app.exec(); } -- cgit v1.2.3-55-g7522