--- infoscreen/main.cpp	2009/12/11 09:25:49	502
+++ infoscreen/main.cpp	2010/07/16 07:41:48	996
@@ -1,64 +1,39 @@
 #include <QApplication>
-#include <QtWebKit>
-#include <QDesktopWidget>
-#include <iostream>
+#include "mainview.h"
+#include <QtDebug>
 
-class MyWebView : public QWebView
-{
-public:
-	MyWebView(QWidget* parent) : QWebView(parent) {
-		this->setWindowState( Qt::WindowFullScreen );
-		qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
-
-		
-		
-	}
-
-	virtual void show() {
-		QWebView::show();
-	
-		this->load( QUrl( generateUrl() ) );
-	}
-
-	QString generateUrl() {
-		QDesktopWidget* desktop = QApplication::desktop();
-		QRect rect = desktop->screenGeometry();
-		
-		QString width;
-		width.setNum( rect.width() );
-
-		QString height;
-		height.setNum( rect.height() );
-
-		
-		QSettings settings("Caddi", "infoscreen");
-		QString url = settings.value("url").toString();
-		QString screenid = settings.value("screenid").toString();
-
-		url.append("?screen_id=").append(screenid);
-		url.append("&width=").append(width);
-		url.append("&height=").append(height);
 
+//TODO: write messages to log file
+void myMessageOutput(QtMsgType type, const char *msg)
+{
+    switch (type) {
+    case QtDebugMsg:
+        fprintf(stderr, "Debug: %s\n", msg);
+        break;
+    case QtWarningMsg:
+        fprintf(stderr, "Warning: %s\n", msg);
+        break;
+    case QtCriticalMsg:
+        fprintf(stderr, "Critical: %s\n", msg);
+        break;
+    case QtFatalMsg:
+        fprintf(stderr, "Fatal: %s\n", msg);
+        abort();
+    }
+}
 
-		std::cout << url.toAscii().data() << std::endl;
-
-		return url;
-	}
-
-};
 
 
 int main(int argc, char** argv) {
-	QApplication app(argc,argv);
 
+    qInstallMsgHandler(myMessageOutput);
+    qDebug() << "--------------------------------------------------------------------------------------------";
 
-	QWebSettings* settings = QWebSettings::globalSettings();
-	settings->setAttribute( QWebSettings::JavascriptEnabled, true);
-	settings->setAttribute( QWebSettings::PluginsEnabled, true);
+	QApplication app(argc,argv);
+	app.setApplicationName("infoscreen");
 
-	MyWebView web(0);
-	web.show();
+	MainView main(0);
+	main.show();
 	
-
 	return app.exec();
 }