--- infoscreen/MainView.cpp	2009/12/12 19:27:56	510
+++ infoscreen/MainView.cpp	2009/12/15 20:36:26	515
@@ -1,49 +1,52 @@
 #include "MainView.h"
+#include <QApplication>
 #include <QPushButton>
+#include <QLabel>
 #include <QVBoxLayout>
 
 #include <QTimer>
 
-MainView::MainView(QWidget* parent)
- : QWidget(parent)
-{
-	this->resize(400,400);
-	this->setPalette( QPalette( Qt::blue ) );
+//#include <VideoPlayer> //Phonon
+//#include <MediaSource> //Phonon
 
+#include "MyWebView.h"
+#include "clientsiderender.h"
 
-	red = new QWidget(this);
-	red->setStyleSheet("QWidget { background-color: red; }");
 
-	green = new QWidget(this);
-	green->setStyleSheet("QWidget { background-color: green; }");
-	green->setVisible(false);
+MainView::MainView(QWidget* parent)
+ : QWidget(parent)
+{
+        this->setWindowState( Qt::WindowFullScreen );
+//	qApp->setOverrideCursor( QCursor( Qt::BlankCursor) );
 
-	current = red;
+	
+	//Phonon::VideoPlayer* video;
+	//video = new Phonon::VideoPlayer(Phonon::VideoCategory, this);	
+	//video->load( Phonon::MediaSource("http://todic.dk/ps3cache/Inglourious_Basterds_2009.avi") );
+	//layout->addWidget(video,1);
+	//video->play();
+
+        render = new ClientSideRender(this);
+        web = new MyWebView(this);
+        web->setVisible( false );
 
 	QVBoxLayout* layout = new QVBoxLayout();
-	layout->addWidget(red,1 );
-	layout->addWidget(green,1);
+        layout->addWidget(web,1);
+        layout->addWidget(render,1);
 	layout->addStretch();
 	layout->setContentsMargins(0,0,0,0);
-	setLayout(layout);
-
-
+        setLayout(layout);
 
 	QTimer* timer = new QTimer(this);
 	connect(timer, SIGNAL(timeout() ), this, SLOT(onTimer() ));
-	timer->start(5000);
+	timer->start(1000);
+	
+	
+        web->start();
 }
 
 
 void MainView::onTimer()
 {
-	if( current == red) {
-		red->setVisible(false);
-		green->setVisible(true);
-		current = green;
-	} else {
-		red->setVisible(true);
-		green->setVisible(false);
-		current = red;
-	}
+    screenManager.timerTick();
 }