--- infoscreen/main.cpp	2009/12/11 15:24:10	505
+++ infoscreen/main.cpp	2009/12/12 18:59:28	509
@@ -1,52 +1,7 @@
 #include <QApplication>
 #include <QtWebKit>
-#include <QDesktopWidget>
-#include <iostream>
+#include "MainView.h"
 
-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");
-		std::cout << settings.fileName().toAscii().data() << std::endl;
-		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);
-
-
-		std::cout << url.toAscii().data() << std::endl;
-
-		return url;
-	}
-
-};
 
 
 int main(int argc, char** argv) {
@@ -57,8 +12,8 @@
 	settings->setAttribute( QWebSettings::JavascriptEnabled, true);
 	settings->setAttribute( QWebSettings::PluginsEnabled, true);
 
-	MyWebView web(0);
-	web.show();
+	MainView main(0);
+	main.show();
 	
 
 	return app.exec();